diff options
Diffstat (limited to 'searchlib')
41 files changed, 381 insertions, 746 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/enumattribute.h b/searchlib/src/vespa/searchlib/attribute/enumattribute.h index 94e5da62967..8cc383d4abf 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/enumattribute.h @@ -2,9 +2,9 @@ #pragma once -#include <vespa/searchlib/attribute/enumstore.h> #include "attributevector.h" #include "loadedenumvalue.h" +#include <vespa/searchlib/attribute/enumstore.h> #include <set> namespace search { @@ -61,18 +61,10 @@ protected: virtual EnumType getFromEnum(EnumHandle e) const { return _enumStore.getValue(e); } virtual void fillPostings(LoadedVector & loaded) { (void) loaded; } - virtual void fillEnum(LoadedVector & loaded) override; - - virtual void - fillEnum0(const void *src, - size_t srcLen, - EnumIndexVector &eidxs) override; - - virtual void - fixupEnumRefCounts(const EnumVector &enumHist) override; - - virtual uint64_t - getUniqueValueCount(void) const override; + void fillEnum(LoadedVector & loaded); + void fillEnum0(const void *src, size_t srcLen, EnumIndexVector &eidxs) override; + void fixupEnumRefCounts(const EnumVector &enumHist) override; + uint64_t getUniqueValueCount(void) const override; static EnumType getDefaultEnumTypeValue() { return B::defaultValue(); } @@ -90,9 +82,8 @@ public: EnumAttribute(const vespalib::string & baseFileName, const AttributeVector::Config & cfg); - virtual ~EnumAttribute(); + ~EnumAttribute(); virtual bool findEnum(EnumType v, EnumHandle & e) const { return _enumStore.findEnum(v, e); } }; } // namespace search - diff --git a/searchlib/src/vespa/searchlib/attribute/flagattribute.h b/searchlib/src/vespa/searchlib/attribute/flagattribute.h index ea73ecb7c51..3fe2424b97d 100644 --- a/searchlib/src/vespa/searchlib/attribute/flagattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/flagattribute.h @@ -40,8 +40,7 @@ public: void setNewBVValue(DocId doc, typename B::WType::ValueType value); private: - virtual bool onAddDoc(DocId doc) override; - + bool onAddDoc(DocId doc) override; void onAddDocs(DocId docIdLimit) override; void ensureGuardBit(BitVector & bv); void ensureGuardBit(); diff --git a/searchlib/src/vespa/searchlib/attribute/multistringattribute.cpp b/searchlib/src/vespa/searchlib/attribute/multistringattribute.cpp index 737f464206e..6e9eaae7c09 100644 --- a/searchlib/src/vespa/searchlib/attribute/multistringattribute.cpp +++ b/searchlib/src/vespa/searchlib/attribute/multistringattribute.cpp @@ -1,11 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "multistringattribute.h" -#include "multistringattribute.hpp" -#include <vespa/log/log.h> -LOG_SETUP(".searchlib.attribute.multistringattribute"); namespace search { template class MultiValueStringAttributeT<EnumAttribute<StringAttribute>, multivalue::Value<EnumStoreBase::Index> >; diff --git a/searchlib/src/vespa/searchlib/features/dotproductfeature.h b/searchlib/src/vespa/searchlib/features/dotproductfeature.h index 4a30c0ecb1b..b94d1717ed1 100644 --- a/searchlib/src/vespa/searchlib/features/dotproductfeature.h +++ b/searchlib/src/vespa/searchlib/features/dotproductfeature.h @@ -156,8 +156,8 @@ public: protected: const A * _attribute; private: - virtual size_t getAttributeValues(uint32_t docid, const AT * & count) override; -public: + size_t getAttributeValues(uint32_t docid, const AT * & count) override; + public: DotProductExecutor(const A * attribute, const V & queryVector); ~DotProductExecutor(); }; diff --git a/searchlib/src/vespa/searchlib/features/raw_score_feature.h b/searchlib/src/vespa/searchlib/features/raw_score_feature.h index ddae8848052..2e37c43c8f7 100644 --- a/searchlib/src/vespa/searchlib/features/raw_score_feature.h +++ b/searchlib/src/vespa/searchlib/features/raw_score_feature.h @@ -8,39 +8,37 @@ namespace search { namespace features { -class RawScoreExecutor : public search::fef::FeatureExecutor +class RawScoreExecutor : public fef::FeatureExecutor { private: - std::vector<search::fef::TermFieldHandle> _handles; + std::vector<fef::TermFieldHandle> _handles; const fef::MatchData *_md; - virtual void handle_bind_match_data(fef::MatchData &md) override; + void handle_bind_match_data(fef::MatchData &md) override; public: - RawScoreExecutor(const search::fef::IQueryEnvironment &env, uint32_t fieldId); - virtual void execute(uint32_t docId) override; + RawScoreExecutor(const fef::IQueryEnvironment &env, uint32_t fieldId); + void execute(uint32_t docId) override; }; //----------------------------------------------------------------------------- -class RawScoreBlueprint : public search::fef::Blueprint +class RawScoreBlueprint : public fef::Blueprint { private: - const search::fef::FieldInfo *_field; + const fef::FieldInfo *_field; public: RawScoreBlueprint() : Blueprint("rawScore"), _field(0) {} - virtual void visitDumpFeatures(const search::fef::IIndexEnvironment &, - search::fef::IDumpFeatureVisitor &) const override {} - virtual search::fef::Blueprint::UP createInstance() const override { + void visitDumpFeatures(const fef::IIndexEnvironment &, + fef::IDumpFeatureVisitor &) const override {} + fef::Blueprint::UP createInstance() const override { return Blueprint::UP(new RawScoreBlueprint()); } - virtual search::fef::ParameterDescriptions getDescriptions() const override { - return search::fef::ParameterDescriptions().desc().field(); + fef::ParameterDescriptions getDescriptions() const override { + return fef::ParameterDescriptions().desc().field(); } - virtual bool setup(const search::fef::IIndexEnvironment &env, - const search::fef::ParameterList ¶ms) override; - virtual search::fef::FeatureExecutor &createExecutor(const search::fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; + bool setup(const fef::IIndexEnvironment &env, const fef::ParameterList ¶ms) override; + fef::FeatureExecutor &createExecutor(const fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; }; } // namespace features } // namespace search - diff --git a/searchlib/src/vespa/searchlib/features/reverseproximityfeature.h b/searchlib/src/vespa/searchlib/features/reverseproximityfeature.h index 7dad54e65d5..020cc25a2f9 100644 --- a/searchlib/src/vespa/searchlib/features/reverseproximityfeature.h +++ b/searchlib/src/vespa/searchlib/features/reverseproximityfeature.h @@ -1,8 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <string> -#include <vector> #include <vespa/searchlib/fef/blueprint.h> #include <vespa/searchlib/fef/featureexecutor.h> @@ -23,7 +21,7 @@ struct ReverseProximityConfig { /** * Implements the executor for reverse proximity. */ -class ReverseProximityExecutor : public search::fef::FeatureExecutor { +class ReverseProximityExecutor : public fef::FeatureExecutor { public: /** * Constructs an executor for reverse proximity. @@ -31,48 +29,32 @@ public: * @param env The query environment. * @param config The completeness config. */ - ReverseProximityExecutor(const search::fef::IQueryEnvironment &env, + ReverseProximityExecutor(const fef::IQueryEnvironment &env, const ReverseProximityConfig &config); - virtual void execute(uint32_t docId) override; + void execute(uint32_t docId) override; private: const ReverseProximityConfig &_config; // The proximity config. - search::fef::TermFieldHandle _termA; // Handle to the first query term. - search::fef::TermFieldHandle _termB; // Handle to the second query term. + fef::TermFieldHandle _termA; // Handle to the first query term. + fef::TermFieldHandle _termB; // Handle to the second query term. const fef::MatchData *_md; - virtual void handle_bind_match_data(fef::MatchData &md) override; + void handle_bind_match_data(fef::MatchData &md) override; }; /** * Implements the blueprint for proximity. */ -class ReverseProximityBlueprint : public search::fef::Blueprint { +class ReverseProximityBlueprint : public fef::Blueprint { public: - /** - * Constructs a blueprint for reverse proximity. - */ ReverseProximityBlueprint(); - - // Inherit doc from Blueprint. - virtual void visitDumpFeatures(const search::fef::IIndexEnvironment &env, - search::fef::IDumpFeatureVisitor &visitor) const override; - - // Inherit doc from Blueprint. - virtual search::fef::Blueprint::UP createInstance() const override; - - // Inherit doc from Blueprint. - virtual search::fef::ParameterDescriptions getDescriptions() const override { - return search::fef::ParameterDescriptions().desc().indexField(search::fef::ParameterCollection::ANY).number().number(); + void visitDumpFeatures(const fef::IIndexEnvironment &env, fef::IDumpFeatureVisitor &visitor) const override; + fef::Blueprint::UP createInstance() const override; + fef::ParameterDescriptions getDescriptions() const override { + return fef::ParameterDescriptions().desc().indexField(fef::ParameterCollection::ANY).number().number(); } - - // Inherit doc from Blueprint. - virtual bool setup(const search::fef::IIndexEnvironment & env, - const search::fef::ParameterList & params) override; - - // Inherit doc from Blueprint. - virtual search::fef::FeatureExecutor &createExecutor(const search::fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; - + bool setup(const fef::IIndexEnvironment & env, const fef::ParameterList & params) override; + fef::FeatureExecutor &createExecutor(const fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; private: ReverseProximityConfig _config; }; diff --git a/searchlib/src/vespa/searchlib/features/subqueries_feature.h b/searchlib/src/vespa/searchlib/features/subqueries_feature.h index 217548b3e96..0c882a9b24a 100644 --- a/searchlib/src/vespa/searchlib/features/subqueries_feature.h +++ b/searchlib/src/vespa/searchlib/features/subqueries_feature.h @@ -8,37 +8,33 @@ namespace search { namespace features { -class SubqueriesExecutor : public search::fef::FeatureExecutor { - std::vector<search::fef::TermFieldHandle> _handles; - const fef::MatchData *_md; - - virtual void handle_bind_match_data(fef::MatchData &md) override; +class SubqueriesExecutor : public fef::FeatureExecutor { + std::vector<fef::TermFieldHandle> _handles; + const fef::MatchData *_md; + void handle_bind_match_data(fef::MatchData &md) override; public: - SubqueriesExecutor(const search::fef::IQueryEnvironment &env, - uint32_t fieldId); - virtual void execute(uint32_t docId) override; + SubqueriesExecutor(const fef::IQueryEnvironment &env, uint32_t fieldId); + void execute(uint32_t docId) override; }; //----------------------------------------------------------------------------- -class SubqueriesBlueprint : public search::fef::Blueprint +class SubqueriesBlueprint : public fef::Blueprint { private: - const search::fef::FieldInfo *_field; + const fef::FieldInfo *_field; public: SubqueriesBlueprint() : Blueprint("subqueries"), _field(nullptr) {} - virtual void visitDumpFeatures(const search::fef::IIndexEnvironment &, - search::fef::IDumpFeatureVisitor &) const override {} - virtual search::fef::Blueprint::UP createInstance() const override { + void visitDumpFeatures(const fef::IIndexEnvironment &, fef::IDumpFeatureVisitor &) const override {} + fef::Blueprint::UP createInstance() const override { return Blueprint::UP(new SubqueriesBlueprint); } - virtual search::fef::ParameterDescriptions getDescriptions() const override { - return search::fef::ParameterDescriptions().desc().field(); + fef::ParameterDescriptions getDescriptions() const override { + return fef::ParameterDescriptions().desc().field(); } - virtual bool setup(const search::fef::IIndexEnvironment &env, - const search::fef::ParameterList ¶ms) override; - virtual search::fef::FeatureExecutor &createExecutor(const search::fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; + bool setup(const fef::IIndexEnvironment &env, const fef::ParameterList ¶ms) override; + fef::FeatureExecutor &createExecutor(const fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; }; } // namespace features diff --git a/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h b/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h index eba2a9f44ae..4f368a9e188 100644 --- a/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h +++ b/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h @@ -34,7 +34,7 @@ public: { _attrBuffer.allocate(_attribute->getMaxValueCount()); } - virtual void execute(uint32_t docId) override; + void execute(uint32_t docId) override; }; template <typename WeightedBufferType> diff --git a/searchlib/src/vespa/searchlib/features/term_field_md_feature.h b/searchlib/src/vespa/searchlib/features/term_field_md_feature.h index ef3d83de98d..6c574aa90b4 100644 --- a/searchlib/src/vespa/searchlib/features/term_field_md_feature.h +++ b/searchlib/src/vespa/searchlib/features/term_field_md_feature.h @@ -16,16 +16,14 @@ namespace features { **/ class TermFieldMdExecutor : public fef::FeatureExecutor { - typedef std::pair<search::fef::TermFieldHandle, query::Weight> Element; + typedef std::pair<fef::TermFieldHandle, query::Weight> Element; std::vector<Element> _terms; const fef::MatchData *_md; - virtual void execute(uint32_t docId) override; - virtual void handle_bind_match_data(fef::MatchData &md) override; - + void execute(uint32_t docId) override; + void handle_bind_match_data(fef::MatchData &md) override; public: - TermFieldMdExecutor(const search::fef::IQueryEnvironment &env, - uint32_t fieldId); + TermFieldMdExecutor(const fef::IQueryEnvironment &env, uint32_t fieldId); }; @@ -33,31 +31,18 @@ public: * Implements the blueprint for the term field md executor. **/ class TermFieldMdBlueprint : public fef::Blueprint { - const search::fef::FieldInfo * _field; + const fef::FieldInfo * _field; public: TermFieldMdBlueprint(); - - // Inherit doc from Blueprint. - virtual void visitDumpFeatures(const fef::IIndexEnvironment & env, - fef::IDumpFeatureVisitor & visitor) const override; - - // Inherit doc from Blueprint. - virtual fef::Blueprint::UP createInstance() const override; - - // Inherit doc from Blueprint. - virtual fef::ParameterDescriptions getDescriptions() const override { + void visitDumpFeatures(const fef::IIndexEnvironment & env, fef::IDumpFeatureVisitor & visitor) const override; + fef::Blueprint::UP createInstance() const override; + fef::ParameterDescriptions getDescriptions() const override { return fef::ParameterDescriptions().desc().field(); } - - // Inherit doc from Blueprint. - virtual bool setup(const fef::IIndexEnvironment & env, - const fef::ParameterList & params) override; - - // Inherit doc from Blueprint. - virtual fef::FeatureExecutor &createExecutor(const fef::IQueryEnvironment & env, vespalib::Stash &stash) const override; + bool setup(const fef::IIndexEnvironment & env, const fef::ParameterList & params) override; + fef::FeatureExecutor &createExecutor(const fef::IQueryEnvironment & env, vespalib::Stash &stash) const override; }; } // namespace features } // namespace search - diff --git a/searchlib/src/vespa/searchlib/features/termdistancefeature.h b/searchlib/src/vespa/searchlib/features/termdistancefeature.h index ed79a51c199..609ea6d1b63 100644 --- a/searchlib/src/vespa/searchlib/features/termdistancefeature.h +++ b/searchlib/src/vespa/searchlib/features/termdistancefeature.h @@ -23,7 +23,7 @@ struct TermDistanceParams { /** * Implements the executor for calculating min term distance (forward and reverse). **/ -class TermDistanceExecutor : public search::fef::FeatureExecutor +class TermDistanceExecutor : public fef::FeatureExecutor { private: const TermDistanceParams & _params; @@ -34,44 +34,31 @@ private: virtual void handle_bind_match_data(fef::MatchData &md) override; public: - TermDistanceExecutor(const search::fef::IQueryEnvironment & env, + TermDistanceExecutor(const fef::IQueryEnvironment & env, const TermDistanceParams & params); - virtual void execute(uint32_t docId) override; - bool valid() const; + void execute(uint32_t docId) override; + bool valid() const; }; /** * Implements the blueprint for the term distance executor. **/ -class TermDistanceBlueprint : public search::fef::Blueprint { +class TermDistanceBlueprint : public fef::Blueprint { private: TermDistanceParams _params; public: TermDistanceBlueprint(); - - // Inherit doc from Blueprint. - virtual void visitDumpFeatures(const search::fef::IIndexEnvironment & env, - search::fef::IDumpFeatureVisitor & visitor) const override; - - // Inherit doc from Blueprint. - virtual search::fef::Blueprint::UP createInstance() const override; - - // Inherit doc from Blueprint. - virtual search::fef::ParameterDescriptions getDescriptions() const override { - return search::fef::ParameterDescriptions().desc().indexField(search::fef::ParameterCollection::ANY).number().number(); + void visitDumpFeatures(const fef::IIndexEnvironment & env, fef::IDumpFeatureVisitor & visitor) const override; + fef::Blueprint::UP createInstance() const override; + fef::ParameterDescriptions getDescriptions() const override { + return fef::ParameterDescriptions().desc().indexField(fef::ParameterCollection::ANY).number().number(); } - - // Inherit doc from Blueprint. - virtual bool setup(const search::fef::IIndexEnvironment & env, - const search::fef::ParameterList & params) override; - - // Inherit doc from Blueprint. - virtual search::fef::FeatureExecutor &createExecutor(const search::fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; + bool setup(const fef::IIndexEnvironment & env, const fef::ParameterList & params) override; + fef::FeatureExecutor &createExecutor(const fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; }; } // namespace features } // namespace search - diff --git a/searchlib/src/vespa/searchlib/features/termeditdistancefeature.h b/searchlib/src/vespa/searchlib/features/termeditdistancefeature.h index 26faaae4b93..c7ef3d672fd 100644 --- a/searchlib/src/vespa/searchlib/features/termeditdistancefeature.h +++ b/searchlib/src/vespa/searchlib/features/termeditdistancefeature.h @@ -1,8 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <string> -#include <vector> #include <vespa/searchlib/fef/blueprint.h> #include <vespa/searchlib/fef/featureexecutor.h> #include <vespa/searchlib/common/feature.h> @@ -45,14 +43,14 @@ struct TermEditDistanceConfig { /** * Implements the executor for the term edit distance calculator. */ -class TermEditDistanceExecutor : public search::fef::FeatureExecutor { +class TermEditDistanceExecutor : public fef::FeatureExecutor { public: /** * Constructs a new executor for the term edit distance calculator. * * @param config The config for this executor. */ - TermEditDistanceExecutor(const search::fef::IQueryEnvironment &env, + TermEditDistanceExecutor(const fef::IQueryEnvironment &env, const TermEditDistanceConfig &config); @@ -80,7 +78,7 @@ public: * * @param docid local document id to be evaluated */ - virtual void execute(uint32_t docId) override; + void execute(uint32_t docId) override; private: /** @@ -91,11 +89,11 @@ private: */ void logRow(const std::vector<TedCell> &row, size_t numCols); - virtual void handle_bind_match_data(fef::MatchData &md) override; + void handle_bind_match_data(fef::MatchData &md) override; private: const TermEditDistanceConfig &_config; // The config for this executor. - std::vector<search::fef::TermFieldHandle> _fieldHandles; // The handles of all query terms. + std::vector<fef::TermFieldHandle> _fieldHandles; // The handles of all query terms. std::vector<feature_t> _termWeights; // The weights of all query terms. std::vector<TedCell> _prevRow; // Optimized representation of the cost table. std::vector<TedCell> _thisRow; // @@ -105,26 +103,17 @@ private: /** * Implements the blueprint for the term edit distance calculator. */ -class TermEditDistanceBlueprint : public search::fef::Blueprint { +class TermEditDistanceBlueprint : public fef::Blueprint { public: /** * Constructs a new blueprint for the term edit distance calculator. */ TermEditDistanceBlueprint(); - - // Inherit doc from Blueprint. - virtual void visitDumpFeatures(const search::fef::IIndexEnvironment &env, - search::fef::IDumpFeatureVisitor &visitor) const override; - - // Inherit doc from Blueprint. - virtual search::fef::Blueprint::UP createInstance() const override; - - // Inherit doc from Blueprint. - virtual search::fef::FeatureExecutor &createExecutor(const search::fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; - - // Inherit doc from Blueprint. - virtual search::fef::ParameterDescriptions getDescriptions() const override { - return search::fef::ParameterDescriptions().desc().indexField(search::fef::ParameterCollection::SINGLE); + void visitDumpFeatures(const fef::IIndexEnvironment &env, fef::IDumpFeatureVisitor &visitor) const override; + fef::Blueprint::UP createInstance() const override; + fef::FeatureExecutor &createExecutor(const fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; + fef::ParameterDescriptions getDescriptions() const override { + return fef::ParameterDescriptions().desc().indexField(fef::ParameterCollection::SINGLE); } /** @@ -143,12 +132,10 @@ public: * @param params A list of the parameters mentioned above. * @return Whether or not setup was possible. */ - virtual bool setup(const search::fef::IIndexEnvironment & env, - const search::fef::ParameterList & params) override; + bool setup(const fef::IIndexEnvironment & env, const fef::ParameterList & params) override; private: TermEditDistanceConfig _config; // The config for this blueprint. }; }} - diff --git a/searchlib/src/vespa/searchlib/features/termfeature.h b/searchlib/src/vespa/searchlib/features/termfeature.h index cb4b92dfc11..cd42333f44b 100644 --- a/searchlib/src/vespa/searchlib/features/termfeature.h +++ b/searchlib/src/vespa/searchlib/features/termfeature.h @@ -1,8 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <string> -#include <vector> #include <vespa/searchlib/fef/blueprint.h> #include <vespa/searchlib/fef/featureexecutor.h> #include <vespa/searchlib/common/feature.h> @@ -13,7 +11,7 @@ namespace features { /** * Implements the executor for term feature. */ -class TermExecutor : public search::fef::FeatureExecutor { +class TermExecutor : public fef::FeatureExecutor { public: /** * Constructs an executor for term feature. @@ -21,48 +19,32 @@ public: * @param env The query environment. * @param termId The id of the query term to evaluate. */ - TermExecutor(const search::fef::IQueryEnvironment &env, - uint32_t termId); - virtual void execute(uint32_t docId) override; + TermExecutor(const fef::IQueryEnvironment &env, uint32_t termId); + void execute(uint32_t docId) override; private: - const search::fef::ITermData *_termData; - feature_t _connectedness; - feature_t _significance; + const fef::ITermData *_termData; + feature_t _connectedness; + feature_t _significance; }; /** * Implements the blueprint for term feature. */ -class TermBlueprint : public search::fef::Blueprint { +class TermBlueprint : public fef::Blueprint { public: - /** - * Constructs a blueprint for term feature. - */ TermBlueprint(); - // Inherit doc from Blueprint. - virtual void visitDumpFeatures(const search::fef::IIndexEnvironment &env, - search::fef::IDumpFeatureVisitor &visitor) const override; - - // Inherit doc from Blueprint. - virtual search::fef::Blueprint::UP createInstance() const override; - - // Inherit doc from Blueprint. - virtual search::fef::ParameterDescriptions getDescriptions() const override { - return search::fef::ParameterDescriptions().desc().number(); + void visitDumpFeatures(const fef::IIndexEnvironment &env, fef::IDumpFeatureVisitor &visitor) const override; + fef::Blueprint::UP createInstance() const override; + fef::ParameterDescriptions getDescriptions() const override { + return fef::ParameterDescriptions().desc().number(); } - - // Inherit doc from Blueprint. - virtual bool setup(const search::fef::IIndexEnvironment & env, - const search::fef::ParameterList & params) override; - - // Inherit doc from Blueprint. - virtual search::fef::FeatureExecutor &createExecutor(const search::fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; + bool setup(const fef::IIndexEnvironment & env, const fef::ParameterList & params) override; + fef::FeatureExecutor &createExecutor(const fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; private: uint32_t _termId; }; }} - diff --git a/searchlib/src/vespa/searchlib/features/terminfofeature.h b/searchlib/src/vespa/searchlib/features/terminfofeature.h index 7f1d8b8a6e2..962b35fc936 100644 --- a/searchlib/src/vespa/searchlib/features/terminfofeature.h +++ b/searchlib/src/vespa/searchlib/features/terminfofeature.h @@ -2,30 +2,26 @@ #pragma once -#include <string> -#include <vector> #include <vespa/searchlib/fef/blueprint.h> #include <vespa/searchlib/fef/featureexecutor.h> namespace search { namespace features { -class TermInfoBlueprint : public search::fef::Blueprint +class TermInfoBlueprint : public fef::Blueprint { private: uint32_t _termIdx; public: TermInfoBlueprint(); - virtual void visitDumpFeatures(const search::fef::IIndexEnvironment &indexEnv, - search::fef::IDumpFeatureVisitor &visitor) const override; - virtual search::fef::Blueprint::UP createInstance() const override { return search::fef::Blueprint::UP(new TermInfoBlueprint()); } - virtual search::fef::ParameterDescriptions getDescriptions() const override { - return search::fef::ParameterDescriptions().desc().number(); + void visitDumpFeatures(const fef::IIndexEnvironment &indexEnv, fef::IDumpFeatureVisitor &visitor) const override; + fef::Blueprint::UP createInstance() const override { return fef::Blueprint::UP(new TermInfoBlueprint()); } + fef::ParameterDescriptions getDescriptions() const override { + return fef::ParameterDescriptions().desc().number(); } - virtual bool setup(const search::fef::IIndexEnvironment & env, - const search::fef::ParameterList & params) override; - virtual search::fef::FeatureExecutor &createExecutor(const search::fef::IQueryEnvironment &queryEnv, vespalib::Stash &stash) const override; + bool setup(const fef::IIndexEnvironment & env, const fef::ParameterList & params) override; + fef::FeatureExecutor &createExecutor(const fef::IQueryEnvironment &queryEnv, vespalib::Stash &stash) const override; }; } // namespace features diff --git a/searchlib/src/vespa/searchlib/features/text_similarity_feature.h b/searchlib/src/vespa/searchlib/features/text_similarity_feature.h index 084d1dd4b1c..b47a7112a0c 100644 --- a/searchlib/src/vespa/searchlib/features/text_similarity_feature.h +++ b/searchlib/src/vespa/searchlib/features/text_similarity_feature.h @@ -2,8 +2,6 @@ #pragma once -#include <string> -#include <vector> #include <vespa/searchlib/fef/fef.h> #include <vespa/vespalib/util/priority_queue.h> @@ -12,7 +10,7 @@ namespace features { //----------------------------------------------------------------------------- -class TextSimilarityExecutor : public search::fef::FeatureExecutor +class TextSimilarityExecutor : public fef::FeatureExecutor { private: std::vector<fef::TermFieldHandle> _handles; @@ -21,11 +19,11 @@ private: struct Item { uint32_t idx; - search::fef::TermFieldMatchData::PositionsIterator pos; - search::fef::TermFieldMatchData::PositionsIterator end; + fef::TermFieldMatchData::PositionsIterator pos; + fef::TermFieldMatchData::PositionsIterator end; Item(uint32_t idx_in, - search::fef::TermFieldMatchData::PositionsIterator pos_in, - search::fef::TermFieldMatchData::PositionsIterator end_in) + fef::TermFieldMatchData::PositionsIterator pos_in, + fef::TermFieldMatchData::PositionsIterator end_in) : idx(idx_in), pos(pos_in), end(end_in) {} bool operator<(const Item &other) const { return (pos->getPosition() == other.pos->getPosition()) @@ -37,17 +35,17 @@ private: vespalib::PriorityQueue<Item> _queue; const fef::MatchData *_md; - virtual void handle_bind_match_data(fef::MatchData &md) override; + void handle_bind_match_data(fef::MatchData &md) override; public: - TextSimilarityExecutor(const search::fef::IQueryEnvironment &env, uint32_t field_id); - virtual bool isPure() override { return _handles.empty(); } - virtual void execute(uint32_t docId) override; + TextSimilarityExecutor(const fef::IQueryEnvironment &env, uint32_t field_id); + bool isPure() override { return _handles.empty(); } + void execute(uint32_t docId) override; }; //----------------------------------------------------------------------------- -class TextSimilarityBlueprint : public search::fef::Blueprint +class TextSimilarityBlueprint : public fef::Blueprint { private: static const vespalib::string score_output; @@ -60,15 +58,13 @@ private: public: TextSimilarityBlueprint(); - virtual void visitDumpFeatures(const search::fef::IIndexEnvironment &env, - search::fef::IDumpFeatureVisitor &visitor) const override; - virtual search::fef::Blueprint::UP createInstance() const override; - virtual search::fef::ParameterDescriptions getDescriptions() const override { - return search::fef::ParameterDescriptions().desc().indexField(search::fef::ParameterCollection::SINGLE); + void visitDumpFeatures(const fef::IIndexEnvironment &env, fef::IDumpFeatureVisitor &visitor) const override; + fef::Blueprint::UP createInstance() const override; + fef::ParameterDescriptions getDescriptions() const override { + return fef::ParameterDescriptions().desc().indexField(fef::ParameterCollection::SINGLE); } - virtual bool setup(const search::fef::IIndexEnvironment &env, - const search::fef::ParameterList ¶ms) override; - virtual search::fef::FeatureExecutor &createExecutor(const search::fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; + bool setup(const fef::IIndexEnvironment &env, const fef::ParameterList ¶ms) override; + fef::FeatureExecutor &createExecutor(const fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; }; //----------------------------------------------------------------------------- diff --git a/searchlib/src/vespa/searchlib/queryeval/create_blueprint_visitor_helper.h b/searchlib/src/vespa/searchlib/queryeval/create_blueprint_visitor_helper.h index 8130c35dc2c..3d99b55f414 100644 --- a/searchlib/src/vespa/searchlib/queryeval/create_blueprint_visitor_helper.h +++ b/searchlib/src/vespa/searchlib/queryeval/create_blueprint_visitor_helper.h @@ -113,30 +113,30 @@ public: void illegalVisit() {} - virtual void visit(search::query::And &) override { illegalVisit(); } - virtual void visit(search::query::AndNot &) override { illegalVisit(); } - virtual void visit(search::query::Equiv &) override { illegalVisit(); } - virtual void visit(search::query::Near &) override { illegalVisit(); } - virtual void visit(search::query::ONear &) override { illegalVisit(); } - virtual void visit(search::query::Or &) override { illegalVisit(); } - virtual void visit(search::query::Rank &) override { illegalVisit(); } - virtual void visit(search::query::WeakAnd &) override { illegalVisit(); } - - virtual void visit(search::query::Phrase &n) override { + void visit(search::query::And &) override { illegalVisit(); } + void visit(search::query::AndNot &) override { illegalVisit(); } + void visit(search::query::Equiv &) override { illegalVisit(); } + void visit(search::query::Near &) override { illegalVisit(); } + void visit(search::query::ONear &) override { illegalVisit(); } + void visit(search::query::Or &) override { illegalVisit(); } + void visit(search::query::Rank &) override { illegalVisit(); } + void visit(search::query::WeakAnd &) override { illegalVisit(); } + + void visit(search::query::Phrase &n) override { visitPhrase(n); } - virtual void visit(search::query::WeightedSetTerm &n) override { visitWeightedSetTerm(n); } - virtual void visit(search::query::DotProduct &n) override { visitDotProduct(n); } - virtual void visit(search::query::WandTerm &n) override { visitWandTerm(n); } - - virtual void visit(search::query::NumberTerm &n) override = 0; - virtual void visit(search::query::LocationTerm &n) override = 0; - virtual void visit(search::query::PrefixTerm &n) override = 0; - virtual void visit(search::query::RangeTerm &n) override = 0; - virtual void visit(search::query::StringTerm &n) override = 0; - virtual void visit(search::query::SubstringTerm &n) override = 0; - virtual void visit(search::query::SuffixTerm &n) override = 0; - virtual void visit(search::query::RegExpTerm &n) override = 0; + void visit(search::query::WeightedSetTerm &n) override { visitWeightedSetTerm(n); } + void visit(search::query::DotProduct &n) override { visitDotProduct(n); } + void visit(search::query::WandTerm &n) override { visitWandTerm(n); } + + void visit(search::query::NumberTerm &n) override = 0; + void visit(search::query::LocationTerm &n) override = 0; + void visit(search::query::PrefixTerm &n) override = 0; + void visit(search::query::RangeTerm &n) override = 0; + void visit(search::query::StringTerm &n) override = 0; + void visit(search::query::SubstringTerm &n) override = 0; + void visit(search::query::SuffixTerm &n) override = 0; + void visit(search::query::RegExpTerm &n) override = 0; }; } // namespace search::queryeval diff --git a/searchlib/src/vespa/searchlib/queryeval/equivsearch.cpp b/searchlib/src/vespa/searchlib/queryeval/equivsearch.cpp index 6732f37482d..974d7fd1ca5 100644 --- a/searchlib/src/vespa/searchlib/queryeval/equivsearch.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/equivsearch.cpp @@ -1,9 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "equivsearch.h" -#include <vespa/vespalib/objects/visit.h> -#include <vespa/searchlib/fef/termmatchdatamerger.h> namespace search { namespace queryeval { @@ -17,7 +14,7 @@ private: bool _valid; protected: - virtual void doUnpack(uint32_t docid) override; + void doUnpack(uint32_t docid) override; public: /** diff --git a/searchlib/src/vespa/searchlib/queryeval/fake_search.h b/searchlib/src/vespa/searchlib/queryeval/fake_search.h index 3ba3d2cf439..020f045f49d 100644 --- a/searchlib/src/vespa/searchlib/queryeval/fake_search.h +++ b/searchlib/src/vespa/searchlib/queryeval/fake_search.h @@ -34,12 +34,11 @@ public: { assert(_tfmda.size() == 1); } - virtual void doSeek(uint32_t docid) override; - virtual void doUnpack(uint32_t docid) override; - virtual const PostingInfo *getPostingInfo() const override { return _result.postingInfo(); } - virtual void visitMembers(vespalib::ObjectVisitor &visitor) const override; + void doSeek(uint32_t docid) override; + void doUnpack(uint32_t docid) override; + const PostingInfo *getPostingInfo() const override { return _result.postingInfo(); } + void visitMembers(vespalib::ObjectVisitor &visitor) const override; }; } // namespace queryeval } // namespace search - diff --git a/searchlib/src/vespa/searchlib/queryeval/fake_searchable.cpp b/searchlib/src/vespa/searchlib/queryeval/fake_searchable.cpp index 9e7e7ed6c9a..6aadb33c035 100644 --- a/searchlib/src/vespa/searchlib/queryeval/fake_searchable.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/fake_searchable.cpp @@ -54,15 +54,15 @@ public: template <class TermNode> void visitTerm(TermNode &n); - virtual void visit(NumberTerm &n) override { visitTerm(n); } - virtual void visit(LocationTerm &n) override { visitTerm(n); } - virtual void visit(PrefixTerm &n) override { visitTerm(n); } - virtual void visit(RangeTerm &n) override { visitTerm(n); } - virtual void visit(StringTerm &n) override { visitTerm(n); } - virtual void visit(SubstringTerm &n) override { visitTerm(n); } - virtual void visit(SuffixTerm &n) override { visitTerm(n); } - virtual void visit(PredicateQuery &n) override { visitTerm(n); } - virtual void visit(RegExpTerm &n) override { visitTerm(n); } + void visit(NumberTerm &n) override { visitTerm(n); } + void visit(LocationTerm &n) override { visitTerm(n); } + void visit(PrefixTerm &n) override { visitTerm(n); } + void visit(RangeTerm &n) override { visitTerm(n); } + void visit(StringTerm &n) override { visitTerm(n); } + void visit(SubstringTerm &n) override { visitTerm(n); } + void visit(SuffixTerm &n) override { visitTerm(n); } + void visit(PredicateQuery &n) override { visitTerm(n); } + void visit(RegExpTerm &n) override { visitTerm(n); } }; template <class Map> diff --git a/searchlib/src/vespa/searchlib/queryeval/fake_searchable.h b/searchlib/src/vespa/searchlib/queryeval/fake_searchable.h index 34b6e250797..822cf439ad6 100644 --- a/searchlib/src/vespa/searchlib/queryeval/fake_searchable.h +++ b/searchlib/src/vespa/searchlib/queryeval/fake_searchable.h @@ -55,12 +55,11 @@ public: const vespalib::string &term, const FakeResult &result); - // inherited from Searchable using Searchable::createBlueprint; - virtual Blueprint::UP createBlueprint(const IRequestContext & requestContext, - const FieldSpec &field, - const search::query::Node &term) override; - virtual ~FakeSearchable(); + Blueprint::UP createBlueprint(const IRequestContext & requestContext, + const FieldSpec &field, + const search::query::Node &term) override; + ~FakeSearchable(); }; } // namespace search::queryeval diff --git a/searchlib/src/vespa/searchlib/queryeval/get_weight_from_node.cpp b/searchlib/src/vespa/searchlib/queryeval/get_weight_from_node.cpp index 9a91bf6e2b8..95615c8b923 100644 --- a/searchlib/src/vespa/searchlib/queryeval/get_weight_from_node.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/get_weight_from_node.cpp @@ -1,15 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".get_weight_from_node"); - #include "get_weight_from_node.h" #include <vespa/searchlib/query/tree/intermediatenodes.h> -#include <vespa/searchlib/query/tree/node.h> #include <vespa/searchlib/query/tree/simplequery.h> #include <vespa/searchlib/query/tree/templatetermvisitor.h> -#include <vespa/searchlib/query/tree/termnodes.h> using search::query::Node; using search::query::SimpleQueryNodeTypes; @@ -31,7 +25,7 @@ struct WeightExtractor : public TemplateTermVisitor<WeightExtractor, } // Treat Equiv nodes as terms. - virtual void visit(search::query::Equiv &n) override { visitTerm(n); } + void visit(search::query::Equiv &n) override { visitTerm(n); } }; } // namespace search::queryeval::<unnamed> diff --git a/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp b/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp index 64776b99f16..65b1257b105 100644 --- a/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/intermediate_blueprints.cpp @@ -542,7 +542,7 @@ class FindSource : public Blueprint::IPredicate { public: FindSource(uint32_t sourceId) : _sourceId(sourceId) { } - virtual bool check(const Blueprint & bp) const override { return bp.getSourceId() == _sourceId; } + bool check(const Blueprint & bp) const override { return bp.getSourceId() == _sourceId; } private: uint32_t _sourceId; }; diff --git a/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.h b/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.h index d910499b463..c0b3c9a9ff6 100644 --- a/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.h +++ b/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.h @@ -81,15 +81,14 @@ public: vespalib::string toString() const { return _str; } - // Overrides ObjectVisitor - virtual void openStruct(const vespalib::string &name, const vespalib::string &type) override; - virtual void closeStruct() override; - virtual void visitBool(const vespalib::string &name, bool value) override; - virtual void visitInt(const vespalib::string &name, int64_t value) override; - virtual void visitFloat(const vespalib::string &name, double value) override; - virtual void visitString(const vespalib::string &name, const vespalib::string &value) override; - virtual void visitNull(const vespalib::string &name) override; - virtual void visitNotImplemented() override; + void openStruct(const vespalib::string &name, const vespalib::string &type) override; + void closeStruct() override; + void visitBool(const vespalib::string &name, bool value) override; + void visitInt(const vespalib::string &name, int64_t value) override; + void visitFloat(const vespalib::string &name, double value) override; + void visitString(const vespalib::string &name, const vespalib::string &value) override; + void visitNull(const vespalib::string &name) override; + void visitNotImplemented() override; }; typedef std::unique_ptr<MonitoringSearchIterator> UP; @@ -115,7 +114,7 @@ public: SearchIterator::initRange(_search->getDocId()+1, _search->getEndId()); } Trinary is_strict() const override { return _search->is_strict(); } - virtual const PostingInfo *getPostingInfo() const override; + const PostingInfo *getPostingInfo() const override; void visitMembers(vespalib::ObjectVisitor &visitor) const override; const SearchIterator &getIterator() const { return *_search; } diff --git a/searchlib/src/vespa/searchlib/queryeval/nearsearch.h b/searchlib/src/vespa/searchlib/queryeval/nearsearch.h index 6ba631abb16..96dd497fb7c 100644 --- a/searchlib/src/vespa/searchlib/queryeval/nearsearch.h +++ b/searchlib/src/vespa/searchlib/queryeval/nearsearch.h @@ -77,10 +77,8 @@ public: uint32_t window, bool strict); - virtual void visitMembers(vespalib::ObjectVisitor &visitor) const override; - - // Inherit doc from SearchIterator. - virtual void doSeek(uint32_t docId) override; + void visitMembers(vespalib::ObjectVisitor &visitor) const override; + void doSeek(uint32_t docId) override; }; /** @@ -97,9 +95,7 @@ private: }; std::vector<Matcher> _matchers; - - // Inherit doc from NearSearchBase. - virtual bool match(uint32_t docId) override; + bool match(uint32_t docId) override; public: /** @@ -131,9 +127,7 @@ private: }; std::vector<Matcher> _matchers; - - // Inherit doc from NearSearchBase. - virtual bool match(uint32_t docId) override; + bool match(uint32_t docId) override; public: /** diff --git a/searchlib/src/vespa/searchlib/queryeval/orlikesearch.h b/searchlib/src/vespa/searchlib/queryeval/orlikesearch.h index 5a62cc5dedb..b1fae7c0bb2 100644 --- a/searchlib/src/vespa/searchlib/queryeval/orlikesearch.h +++ b/searchlib/src/vespa/searchlib/queryeval/orlikesearch.h @@ -2,8 +2,8 @@ #pragma once -#include <vespa/vespalib/objects/visit.h> #include "orsearch.h" +#include <vespa/vespalib/objects/visit.h> namespace search { namespace queryeval { @@ -52,16 +52,16 @@ public: _unpacker(unpacker) { } private: - virtual void onRemove(size_t index) override { + void onRemove(size_t index) override { _unpacker.onRemove(index); } - virtual void onInsert(size_t index) override { + void onInsert(size_t index) override { _unpacker.onInsert(index); } - virtual void doUnpack(uint32_t docid) override { + void doUnpack(uint32_t docid) override { _unpacker.unpack(docid, *this); } - virtual bool needUnpack(size_t index) const override { + bool needUnpack(size_t index) const override { return _unpacker.needUnpack(index); } Unpack _unpacker; @@ -70,4 +70,3 @@ private: } // namespace queryeval } // namespace search - diff --git a/searchlib/src/vespa/searchlib/queryeval/orsearch.h b/searchlib/src/vespa/searchlib/queryeval/orsearch.h index e75776d7161..bd3d0aa5e3f 100644 --- a/searchlib/src/vespa/searchlib/queryeval/orsearch.h +++ b/searchlib/src/vespa/searchlib/queryeval/orsearch.h @@ -27,9 +27,9 @@ public: protected: OrSearch(const Children & children) : MultiSearch(children) { } private: - virtual bool isOr() const override { return true; } + + bool isOr() const override { return true; } }; } // namespace queryeval } // namespace search - diff --git a/searchlib/src/vespa/searchlib/queryeval/simple_phrase_search.h b/searchlib/src/vespa/searchlib/queryeval/simple_phrase_search.h index 2d1f09da9c8..46765f40fd6 100644 --- a/searchlib/src/vespa/searchlib/queryeval/simple_phrase_search.h +++ b/searchlib/src/vespa/searchlib/queryeval/simple_phrase_search.h @@ -48,10 +48,9 @@ public: const fef::TermFieldMatchDataArray &childMatch, std::vector<uint32_t> eval_order, fef::TermFieldMatchData &tmd, bool strict); - - virtual void doSeek(uint32_t doc_id) override; - virtual void doUnpack(uint32_t doc_id) override; - virtual void visitMembers(vespalib::ObjectVisitor &visitor) const override; + void doSeek(uint32_t doc_id) override; + void doUnpack(uint32_t doc_id) override; + void visitMembers(vespalib::ObjectVisitor &visitor) const override; SimplePhraseSearch & setDoom(const vespalib::Doom * doom) { _doom = doom; return *this; } }; diff --git a/searchlib/src/vespa/searchlib/queryeval/simplesearch.h b/searchlib/src/vespa/searchlib/queryeval/simplesearch.h index 50553541e98..53c22deb237 100644 --- a/searchlib/src/vespa/searchlib/queryeval/simplesearch.h +++ b/searchlib/src/vespa/searchlib/queryeval/simplesearch.h @@ -23,8 +23,8 @@ private: SimpleSearch &operator=(const SimpleSearch &); protected: - virtual void doSeek(uint32_t docid) override; - virtual void doUnpack(uint32_t docid) override; + void doSeek(uint32_t docid) override; + void doUnpack(uint32_t docid) override; public: SimpleSearch(const SimpleResult &result); @@ -32,8 +32,8 @@ public: _tag = t; return *this; } - virtual void visitMembers(vespalib::ObjectVisitor &visitor) const override; - virtual ~SimpleSearch(); + void visitMembers(vespalib::ObjectVisitor &visitor) const override; + ~SimpleSearch(); }; } // namespace queryeval diff --git a/searchlib/src/vespa/searchlib/queryeval/termasstring.cpp b/searchlib/src/vespa/searchlib/queryeval/termasstring.cpp index 07a7763d626..8aa015dc752 100644 --- a/searchlib/src/vespa/searchlib/queryeval/termasstring.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/termasstring.cpp @@ -78,29 +78,28 @@ struct TermAsStringVisitor : public QueryVisitor { isSet = false; } - virtual void visit(And &) override { illegalVisit(); } - virtual void visit(AndNot &) override { illegalVisit(); } - virtual void visit(Equiv &) override { illegalVisit(); } - virtual void visit(Near &) override { illegalVisit(); } - virtual void visit(ONear &) override { illegalVisit(); } - virtual void visit(Or &) override { illegalVisit(); } - virtual void visit(Phrase &) override { illegalVisit(); } - virtual void visit(Rank &) override { illegalVisit(); } - virtual void visit(WeakAnd &) override { illegalVisit(); } - virtual void visit(WeightedSetTerm &) override { illegalVisit(); } - virtual void visit(DotProduct &) override { illegalVisit(); } - virtual void visit(WandTerm &) override { illegalVisit(); } - - virtual void visit(NumberTerm &n) override { visitTerm(n); } - virtual void visit(LocationTerm &n) override { visitTerm(n); } - virtual void visit(PrefixTerm &n) override { visitTerm(n); } - virtual void visit(RangeTerm &n) override { visitTerm(n); } - virtual void visit(StringTerm &n) override { visitTerm(n); } - virtual void visit(SubstringTerm &n) override { visitTerm(n); } - virtual void visit(SuffixTerm &n) override { visitTerm(n); } - virtual void visit(RegExpTerm &n) override { visitTerm(n); } - - virtual void visit(PredicateQuery &) override { illegalVisit(); } + void visit(And &) override {illegalVisit(); } + void visit(AndNot &) override {illegalVisit(); } + void visit(Equiv &) override {illegalVisit(); } + void visit(Near &) override {illegalVisit(); } + void visit(ONear &) override {illegalVisit(); } + void visit(Or &) override {illegalVisit(); } + void visit(Phrase &) override {illegalVisit(); } + void visit(Rank &) override {illegalVisit(); } + void visit(WeakAnd &) override {illegalVisit(); } + void visit(WeightedSetTerm &) override {illegalVisit(); } + void visit(DotProduct &) override {illegalVisit(); } + void visit(WandTerm &) override {illegalVisit(); } + + void visit(NumberTerm &n) override {visitTerm(n); } + void visit(LocationTerm &n) override {visitTerm(n); } + void visit(PrefixTerm &n) override {visitTerm(n); } + void visit(RangeTerm &n) override {visitTerm(n); } + void visit(StringTerm &n) override {visitTerm(n); } + void visit(SubstringTerm &n) override {visitTerm(n); } + void visit(SuffixTerm &n) override {visitTerm(n); } + void visit(RegExpTerm &n) override {visitTerm(n); } + void visit(PredicateQuery &) override {illegalVisit(); } }; } // namespace diff --git a/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_search.h b/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_search.h index 1c3059913e8..3c1aba30bf7 100644 --- a/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_search.h +++ b/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_search.h @@ -15,7 +15,7 @@ struct WeakAndSearch : SearchIterator { virtual wand::score_t get_max_score(size_t idx) const = 0; virtual const Terms &getTerms() const = 0; virtual uint32_t getN() const = 0; - virtual void visitMembers(vespalib::ObjectVisitor &visitor) const override; + void visitMembers(vespalib::ObjectVisitor &visitor) const override; static SearchIterator *createArrayWand(const Terms &terms, uint32_t n, bool strict); static SearchIterator *createHeapWand(const Terms &terms, uint32_t n, bool strict); static SearchIterator *create(const Terms &terms, uint32_t n, bool strict); diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakeegcompr64filterocc.cpp b/searchlib/src/vespa/searchlib/test/fakedata/fakeegcompr64filterocc.cpp index c1f9baedb17..2b7b5398e1e 100644 --- a/searchlib/src/vespa/searchlib/test/fakedata/fakeegcompr64filterocc.cpp +++ b/searchlib/src/vespa/searchlib/test/fakedata/fakeegcompr64filterocc.cpp @@ -788,11 +788,8 @@ class FakeEGCompr64SkipFilterOcc : public FakeEGCompr64FilterOcc { public: FakeEGCompr64SkipFilterOcc(const FakeWord &fw); - - ~FakeEGCompr64SkipFilterOcc(void); - - virtual search::queryeval::SearchIterator * - createIterator(const fef::TermFieldMatchDataArray &matchData) const override; + ~FakeEGCompr64SkipFilterOcc(); + search::queryeval::SearchIterator *createIterator(const fef::TermFieldMatchDataArray &matchData) const override; }; diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakeegcompr64filterocc.h b/searchlib/src/vespa/searchlib/test/fakedata/fakeegcompr64filterocc.h index fb49bd22cda..a2bd1ab1038 100644 --- a/searchlib/src/vespa/searchlib/test/fakedata/fakeegcompr64filterocc.h +++ b/searchlib/src/vespa/searchlib/test/fakedata/fakeegcompr64filterocc.h @@ -4,11 +4,9 @@ #include "fakeword.h" #include "fakeposting.h" -namespace search -{ +namespace search { -namespace fakedata -{ +namespace fakedata { /* * Old compressed posocc format. @@ -40,70 +38,30 @@ private: void setup(const FakeWord &fw); template <bool bigEndian> - void - setupT(const FakeWord &fw); + void setupT(const FakeWord &fw); public: FakeEGCompr64FilterOcc(const FakeWord &fw); - - FakeEGCompr64FilterOcc(const FakeWord &fw, - bool bigEndian, - const char *nameSuffix); - - ~FakeEGCompr64FilterOcc(void); - - static void - forceLink(void); - - /* - * Size of posting list, in bits. - */ - size_t bitSize(void) const override; - - virtual bool hasWordPositions(void) const override; - - /* - * Size of posting skip list, in bits. - */ - size_t skipBitSize(void) const override; - size_t l1SkipBitSize(void) const override; - size_t l2SkipBitSize(void) const override; - size_t l3SkipBitSize(void) const override; - size_t l4SkipBitSize(void) const override; - - /* - * Single posting list performance, without feature unpack. - */ - virtual int - lowLevelSinglePostingScan(void) const override; - - /* - * Single posting list performance, with feature unpack. - */ - virtual int - lowLevelSinglePostingScanUnpack(void) const override; - - /* - * Two posting lists performance (same format) without feature unpack. - */ - virtual int - lowLevelAndPairPostingScan(const FakePosting &rhs) const override; - - /* - * Two posting lists performance (same format) with feature unpack. - */ - virtual int - lowLevelAndPairPostingScanUnpack(const FakePosting &rhs) const override; - - - /* - * Iterator factory, for current query evaluation framework. - */ - virtual search::queryeval::SearchIterator * - createIterator(const fef::TermFieldMatchDataArray &matchData) const override; + FakeEGCompr64FilterOcc(const FakeWord &fw, bool bigEndian, const char *nameSuffix); + + ~FakeEGCompr64FilterOcc(); + + static void forceLink(); + + size_t bitSize() const override; + bool hasWordPositions() const override; + size_t skipBitSize() const override; + size_t l1SkipBitSize() const override; + size_t l2SkipBitSize() const override; + size_t l3SkipBitSize() const override; + size_t l4SkipBitSize() const override; + int lowLevelSinglePostingScan() const override; + int lowLevelSinglePostingScanUnpack() const override; + int lowLevelAndPairPostingScan(const FakePosting &rhs) const override; + int lowLevelAndPairPostingScanUnpack(const FakePosting &rhs) const override; + queryeval::SearchIterator *createIterator(const fef::TermFieldMatchDataArray &matchData) const override; }; } // namespace fakedata } // namespace search - diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakefilterocc.h b/searchlib/src/vespa/searchlib/test/fakedata/fakefilterocc.h index 427110383fd..2946f15c539 100644 --- a/searchlib/src/vespa/searchlib/test/fakedata/fakefilterocc.h +++ b/searchlib/src/vespa/searchlib/test/fakedata/fakefilterocc.h @@ -4,11 +4,9 @@ #include "fakeword.h" #include "fakeposting.h" -namespace search -{ +namespace search { -namespace fakedata -{ +namespace fakedata { /* * Old posocc format. @@ -22,51 +20,19 @@ private: public: FakeFilterOcc(const FakeWord &fakeword); - ~FakeFilterOcc(void); - - static void - forceLink(void); - - /* - * Size of posting list, in bits. - */ - size_t bitSize(void) const override; - - virtual bool hasWordPositions(void) const override; + ~FakeFilterOcc(); - /* - * Single posting list performance, without feature unpack. - */ - virtual int - lowLevelSinglePostingScan(void) const override; + static void forceLink(); - /* - * Single posting list performance, with feature unpack. - */ - virtual int - lowLevelSinglePostingScanUnpack(void) const override; - - /* - * Two posting lists performance (same format) without feature unpack. - */ - virtual int - lowLevelAndPairPostingScan(const FakePosting &rhs) const override; - - /* - * Two posting lists performance (same format) with feature unpack. - */ - virtual int - lowLevelAndPairPostingScanUnpack(const FakePosting &rhs) const override; - - - /* - * Iterator factory, for current query evaluation framework. - */ - virtual search::queryeval::SearchIterator * - createIterator(const fef::TermFieldMatchDataArray &matchData) const override; + size_t bitSize() const override; + bool hasWordPositions(void) const override; + int lowLevelSinglePostingScan(void) const override; + int lowLevelSinglePostingScanUnpack(void) const override; + int lowLevelAndPairPostingScan(const FakePosting &rhs) const override; + int lowLevelAndPairPostingScanUnpack(const FakePosting &rhs) const override; + queryeval::SearchIterator * createIterator(const fef::TermFieldMatchDataArray &matchData) const override; }; } // namespace fakedata } // namespace search - diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h index c4f3e27c4ac..efbe44b605e 100644 --- a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h +++ b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h @@ -9,11 +9,8 @@ #include <vespa/searchlib/bitcompression/compression.h> #include <vespa/searchlib/bitcompression/posocccompression.h> -namespace search -{ - -namespace fakedata -{ +namespace search { +namespace fakedata { class FakeMemTreeOccMgr : public FakeWord::RandomizedWriter { @@ -38,12 +35,9 @@ public: PostingIdx(NodeAllocator &allocator) : _tree(), _iterator(_tree.getRoot(), allocator) - { - } + {} - void - clear(void) - { + void clear() { _tree.clear(_iterator.getAllocator()); _iterator = _tree.begin(_iterator.getAllocator()); } @@ -64,8 +58,7 @@ public: _features(), _removal(true), _seq(0) - { - } + {} PendingOp(uint32_t wordIdx, uint32_t docId, EntryRef features) : _wordIdx(wordIdx), @@ -73,42 +66,15 @@ public: _features(features), _removal(false), _seq(0) - { - } + {} - void - setSeq(uint32_t seq) - { - _seq = seq; - } - - uint32_t - getWordIdx(void) const - { - return _wordIdx; - } + void setSeq(uint32_t seq) { _seq = seq; } + uint32_t getWordIdx(void) const { return _wordIdx; } + uint32_t getDocId(void) const { return _docId; } + EntryRef getFeatureRef(void) const { return _features; } + bool getRemove() const { return _removal; } - uint32_t - getDocId(void) const - { - return _docId; - } - - EntryRef - getFeatureRef(void) const - { - return _features; - } - - bool - getRemove(void) const - { - return _removal; - } - - bool - operator<(const PendingOp &rhs) const - { + bool operator<(const PendingOp &rhs) const { if (_wordIdx != rhs._wordIdx) return _wordIdx < rhs._wordIdx; if (_docId != rhs._docId) @@ -125,42 +91,19 @@ public: FeatureStore _featureStore; FakeMemTreeOccMgr(const Schema &schema); - - virtual - ~FakeMemTreeOccMgr(void); - - void - freeze(void); - - void - transferHoldLists(void); - - void - incGeneration(void); - - void - trimHoldLists(void); - - void - sync(void); - - virtual void - add(uint32_t wordIdx, index::DocIdAndFeatures &features) override; - - virtual void - remove(uint32_t wordIdx, uint32_t docId) override; - - void - sortUnflushed(void); - - void - flush(void); - - void - compactTrees(void); - - void - finalize(void); + ~FakeMemTreeOccMgr(); + + void freeze(); + void transferHoldLists(); + void incGeneration(); + void trimHoldLists(); + void sync(); + void add(uint32_t wordIdx, index::DocIdAndFeatures &features) override; + void remove(uint32_t wordIdx, uint32_t docId) override; + void sortUnflushed(); + void flush(); + void compactTrees(); + void finalize(); }; @@ -174,7 +117,9 @@ public: FakeMemTreeOccMgr _mgr; FakeMemTreeOccFactory(const Schema &schema); + ~FakeMemTreeOccFactory(); +<<<<<<< HEAD virtual ~FakeMemTreeOccFactory(void); @@ -183,21 +128,20 @@ public: virtual void setup(const std::vector<const FakeWord *> &fws) override; +======= + FakePosting::SP make(const FakeWord &fw) override; + void setup(const std::vector<const FakeWord *> &fws) override; +>>>>>>> Use override }; class FakeMemTreeOcc2Factory : public FakeMemTreeOccFactory { public: FakeMemTreeOcc2Factory(const Schema &schema); + ~FakeMemTreeOcc2Factory(); - virtual - ~FakeMemTreeOcc2Factory(void); - - virtual FakePosting::SP - make(const FakeWord &fw) override; - - virtual void - setup(const std::vector<const FakeWord *> &fws) override; + FakePosting::SP make(const FakeWord &fw) override; + void setup(const std::vector<const FakeWord *> &fws) override; }; @@ -235,51 +179,18 @@ public: const FakeMemTreeOccMgr &mgr, const char *suffix); - ~FakeMemTreeOcc(void); - - static void - forceLink(void); - - /* - * Size of posting list, in bits. - */ - size_t bitSize(void) const override; - - virtual bool hasWordPositions(void) const override; - - /* - * Single posting list performance, without feature unpack. - */ - virtual int - lowLevelSinglePostingScan(void) const override; + ~FakeMemTreeOcc(); - /* - * Single posting list performance, with feature unpack. - */ - virtual int - lowLevelSinglePostingScanUnpack(void) const override; - - /* - * Two posting lists performance (same format) without feature unpack. - */ - virtual int - lowLevelAndPairPostingScan(const FakePosting &rhs) const override; - - /* - * Two posting lists performance (same format) with feature unpack. - */ - virtual int - lowLevelAndPairPostingScanUnpack(const FakePosting &rhs) const override; - - - /* - * Iterator factory, for current query evaluation framework. - */ - virtual search::queryeval::SearchIterator * - createIterator(const fef::TermFieldMatchDataArray &matchData) const override; + static void forceLink(); + size_t bitSize() const override; + bool hasWordPositions() const override; + int lowLevelSinglePostingScan() const override; + int lowLevelSinglePostingScanUnpack() const override; + int lowLevelAndPairPostingScan(const FakePosting &rhs) const override; + int lowLevelAndPairPostingScanUnpack(const FakePosting &rhs) const override; + queryeval::SearchIterator *createIterator(const fef::TermFieldMatchDataArray &matchData) const override; }; } // namespace fakedata } // namespace search - diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakezcbfilterocc.h b/searchlib/src/vespa/searchlib/test/fakedata/fakezcbfilterocc.h index 5e146b5705a..f88df381d92 100644 --- a/searchlib/src/vespa/searchlib/test/fakedata/fakezcbfilterocc.h +++ b/searchlib/src/vespa/searchlib/test/fakedata/fakezcbfilterocc.h @@ -4,11 +4,9 @@ #include "fakeword.h" #include "fakeposting.h" -namespace search -{ +namespace search { -namespace fakedata -{ +namespace fakedata { /* * YST style compression of docid list. @@ -22,52 +20,19 @@ private: size_t _bitSize; public: FakeZcbFilterOcc(const FakeWord &fw); + ~FakeZcbFilterOcc(); - ~FakeZcbFilterOcc(void); - - static void - forceLink(void); - - /* - * Size of posting list, in bits. - */ - size_t bitSize(void) const override; - - virtual bool hasWordPositions(void) const override; - - /* - * Single posting list performance, without feature unpack. - */ - virtual int - lowLevelSinglePostingScan(void) const override; + static void forceLink(); - /* - * Single posting list performance, with feature unpack. - */ - virtual int - lowLevelSinglePostingScanUnpack(void) const override; - - /* - * Two posting lists performance (same format) without feature unpack. - */ - virtual int - lowLevelAndPairPostingScan(const FakePosting &rhs) const override; - - /* - * Two posting lists performance (same format) with feature unpack. - */ - virtual int - lowLevelAndPairPostingScanUnpack(const FakePosting &rhs) const override; - - - /* - * Iterator factory, for current query evaluation framework. - */ - virtual search::queryeval::SearchIterator * - createIterator(const fef::TermFieldMatchDataArray &matchData) const override; + size_t bitSize() const override; + bool hasWordPositions() const override; + int lowLevelSinglePostingScan() const override; + int lowLevelSinglePostingScanUnpack() const override; + int lowLevelAndPairPostingScan(const FakePosting &rhs) const override; + int lowLevelAndPairPostingScanUnpack(const FakePosting &rhs) const override; + queryeval::SearchIterator *createIterator(const fef::TermFieldMatchDataArray &matchData) const override; }; } // namespace fakedata } // namespace search - diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakezcfilterocc.cpp b/searchlib/src/vespa/searchlib/test/fakedata/fakezcfilterocc.cpp index dfd47889513..316b80f9596 100644 --- a/searchlib/src/vespa/searchlib/test/fakedata/fakezcfilterocc.cpp +++ b/searchlib/src/vespa/searchlib/test/fakedata/fakezcfilterocc.cpp @@ -1,16 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".fakezcfilterocc"); #include "fakezcfilterocc.h" -#include <vespa/searchlib/bitcompression/compression.h> -#include <vespa/searchlib/bitcompression/posocccompression.h> -#include <vespa/searchlib/diskindex/zcposocciterators.h> -#include <vespa/searchlib/index/docidandfeatures.h> -#include <vespa/searchlib/index/postinglistcounts.h> #include "fpfactory.h" - +#include <vespa/searchlib/diskindex/zcposocciterators.h> using search::fef::TermFieldMatchData; using search::fef::TermFieldMatchDataArray; @@ -26,11 +18,9 @@ using search::bitcompression::FeatureEncodeContext; using search::ComprFileWriteContext; using namespace search::diskindex; -namespace search -{ +namespace search { -namespace fakedata -{ +namespace fakedata { #define L1SKIPSTRIDE 16 @@ -769,10 +759,8 @@ class FakeZcSkipFilterOcc : public FakeZcFilterOcc public: FakeZcSkipFilterOcc(const FakeWord &fw); - ~FakeZcSkipFilterOcc(void); - - virtual SearchIterator * - createIterator(const TermFieldMatchDataArray &matchData) const override; + ~FakeZcSkipFilterOcc(); + SearchIterator *createIterator(const TermFieldMatchDataArray &matchData) const override; }; static FPFactoryInit @@ -1384,7 +1372,9 @@ class FakeEGCompr64PosOcc : public FakeZcFilterOcc { public: FakeEGCompr64PosOcc(const FakeWord &fw); + ~FakeEGCompr64PosOcc(); +<<<<<<< HEAD ~FakeEGCompr64PosOcc(void); void setup(const FakeWord &fw); @@ -1395,6 +1385,12 @@ public: virtual SearchIterator * createIterator(const TermFieldMatchDataArray &matchData) const override; +======= + void setup(const FakeWord &fw); + size_t bitSize() const override; + bool hasWordPositions() const override; + SearchIterator *createIterator(const TermFieldMatchDataArray &matchData) const override; +>>>>>>> Use override }; @@ -1488,7 +1484,7 @@ FakeEGCompr64PosOcc<bigEndian>::setup(const FakeWord &fw) template <bool bigEndian> size_t -FakeEGCompr64PosOcc<bigEndian>::bitSize(void) const +FakeEGCompr64PosOcc<bigEndian>::bitSize() const { return _compressedBits; } @@ -1496,7 +1492,7 @@ FakeEGCompr64PosOcc<bigEndian>::bitSize(void) const template <bool bigEndian> bool -FakeEGCompr64PosOcc<bigEndian>::hasWordPositions(void) const +FakeEGCompr64PosOcc<bigEndian>::hasWordPositions() const { return true; } @@ -1517,9 +1513,11 @@ class FakeEG2Compr64PosOcc : public FakeZcFilterOcc { public: FakeEG2Compr64PosOcc(const FakeWord &fw); + ~FakeEG2Compr64PosOcc(); - ~FakeEG2Compr64PosOcc(void); + void setup(const FakeWord &fw); +<<<<<<< HEAD void setup(const FakeWord &fw); size_t bitSize(void) const override; @@ -1528,6 +1526,11 @@ public: virtual SearchIterator * createIterator(const fef::TermFieldMatchDataArray &matchData) const override; +======= + size_t bitSize() const override; + bool hasWordPositions() const override; + SearchIterator *createIterator(const fef::TermFieldMatchDataArray &matchData) const override; +>>>>>>> Use override }; @@ -1651,6 +1654,7 @@ class FakeZcSkipPosOcc : public FakeZcFilterOcc public: FakeZcSkipPosOcc(const FakeWord &fw); +<<<<<<< HEAD ~FakeZcSkipPosOcc(void); size_t bitSize(void) const override; @@ -1659,6 +1663,13 @@ public: virtual SearchIterator * createIterator(const TermFieldMatchDataArray &matchData) const override; +======= + ~FakeZcSkipPosOcc(); + + size_t bitSize() const override; + bool hasWordPositions() const override; + SearchIterator *createIterator(const TermFieldMatchDataArray &matchData) const override; +>>>>>>> Use override }; @@ -1673,14 +1684,14 @@ FakeZcSkipPosOcc<bigEndian>::FakeZcSkipPosOcc(const FakeWord &fw) template <bool bigEndian> -FakeZcSkipPosOcc<bigEndian>::~FakeZcSkipPosOcc(void) +FakeZcSkipPosOcc<bigEndian>::~FakeZcSkipPosOcc() { } template <bool bigEndian> size_t -FakeZcSkipPosOcc<bigEndian>::bitSize(void) const +FakeZcSkipPosOcc<bigEndian>::bitSize() const { return _compressedBits - _l1SkipSize - _l2SkipSize - _l3SkipSize - _l4SkipSize; @@ -1689,7 +1700,7 @@ FakeZcSkipPosOcc<bigEndian>::bitSize(void) const template <bool bigEndian> bool -FakeZcSkipPosOcc<bigEndian>::hasWordPositions(void) const +FakeZcSkipPosOcc<bigEndian>::hasWordPositions() const { return true; } @@ -1714,7 +1725,9 @@ class FakeZc2SkipPosOcc : public FakeZcFilterOcc search::index::PostingListCounts _counts; public: FakeZc2SkipPosOcc(const FakeWord &fw); + ~FakeZc2SkipPosOcc(); +<<<<<<< HEAD ~FakeZc2SkipPosOcc(void); size_t bitSize(void) const override; @@ -1723,6 +1736,11 @@ public: virtual SearchIterator * createIterator(const TermFieldMatchDataArray &matchData) const override; +======= + size_t bitSize() const override; + bool hasWordPositions() const override; + SearchIterator *createIterator(const TermFieldMatchDataArray &matchData) const override; +>>>>>>> Use override }; @@ -1737,14 +1755,14 @@ FakeZc2SkipPosOcc<bigEndian>::FakeZc2SkipPosOcc(const FakeWord &fw) template <bool bigEndian> -FakeZc2SkipPosOcc<bigEndian>::~FakeZc2SkipPosOcc(void) +FakeZc2SkipPosOcc<bigEndian>::~FakeZc2SkipPosOcc() { } template <bool bigEndian> size_t -FakeZc2SkipPosOcc<bigEndian>::bitSize(void) const +FakeZc2SkipPosOcc<bigEndian>::bitSize() const { return _compressedBits - _l1SkipSize - _l2SkipSize - _l3SkipSize - _l4SkipSize; @@ -1753,7 +1771,7 @@ FakeZc2SkipPosOcc<bigEndian>::bitSize(void) const template <bool bigEndian> bool -FakeZc2SkipPosOcc<bigEndian>::hasWordPositions(void) const +FakeZc2SkipPosOcc<bigEndian>::hasWordPositions() const { return true; } diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakezcfilterocc.h b/searchlib/src/vespa/searchlib/test/fakedata/fakezcfilterocc.h index 65ac3ead5d1..5d81e37001e 100644 --- a/searchlib/src/vespa/searchlib/test/fakedata/fakezcfilterocc.h +++ b/searchlib/src/vespa/searchlib/test/fakedata/fakezcfilterocc.h @@ -1,17 +1,14 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once - #include "fakeword.h" #include "fakeposting.h" #include <vespa/searchlib/bitcompression/compression.h> #include <vespa/searchlib/bitcompression/posocccompression.h> -namespace search -{ +namespace search { -namespace fakedata -{ +namespace fakedata { /* * YST style compression of docid list. @@ -38,70 +35,29 @@ protected: void setup(const FakeWord &fw, bool doFeatures, bool dynamicK); template <bool bigEndian> - void - setupT(const FakeWord &fw, bool doFeatures, bool dynamicK); + void setupT(const FakeWord &fw, bool doFeatures, bool dynamicK); public: FakeZcFilterOcc(const FakeWord &fw); - - FakeZcFilterOcc(const FakeWord &fw, - bool bigEndian, - const char *nameSuffix); - - ~FakeZcFilterOcc(void); - - static void - forceLink(void); - - /* - * Size of posting list, in bits. - */ - size_t bitSize(void) const override; - - virtual bool hasWordPositions(void) const override; - - /* - * Size of posting skip list, in bits. - */ - size_t skipBitSize(void) const override; - size_t l1SkipBitSize(void) const override; - size_t l2SkipBitSize(void) const override; - size_t l3SkipBitSize(void) const override; - size_t l4SkipBitSize(void) const override; - - /* - * Single posting list performance, without feature unpack. - */ - virtual int - lowLevelSinglePostingScan(void) const override; - - /* - * Single posting list performance, with feature unpack. - */ - virtual int - lowLevelSinglePostingScanUnpack(void) const override; - - /* - * Two posting lists performance (same format) without feature unpack. - */ - virtual int - lowLevelAndPairPostingScan(const FakePosting &rhs) const override; - - /* - * Two posting lists performance (same format) with feature unpack. - */ - virtual int - lowLevelAndPairPostingScanUnpack(const FakePosting &rhs) const override; - - - /* - * Iterator factory, for current query evaluation framework. - */ - virtual search::queryeval::SearchIterator * - createIterator(const fef::TermFieldMatchDataArray &matchData) const override; + FakeZcFilterOcc(const FakeWord &fw, bool bigEndian, const char *nameSuffix); + ~FakeZcFilterOcc(); + + static void forceLink(); + + size_t bitSize() const override; + bool hasWordPositions() const override; + size_t skipBitSize() const override; + size_t l1SkipBitSize() const override; + size_t l2SkipBitSize() const override; + size_t l3SkipBitSize() const override; + size_t l4SkipBitSize() const override; + int lowLevelSinglePostingScan() const override; + int lowLevelSinglePostingScanUnpack() const override; + int lowLevelAndPairPostingScan(const FakePosting &rhs) const override; + int lowLevelAndPairPostingScanUnpack(const FakePosting &rhs) const override; + queryeval::SearchIterator *createIterator(const fef::TermFieldMatchDataArray &matchData) const override; }; } // namespace fakedata } // namespace search - diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fpfactory.h b/searchlib/src/vespa/searchlib/test/fakedata/fpfactory.h index bf02e815da8..aa67eb1b933 100644 --- a/searchlib/src/vespa/searchlib/test/fakedata/fpfactory.h +++ b/searchlib/src/vespa/searchlib/test/fakedata/fpfactory.h @@ -41,9 +41,7 @@ public: (void) schema; } - virtual FakePosting::SP - make(const FakeWord &fw) override - { + FakePosting::SP make(const FakeWord &fw) override { return FakePosting::SP(new P(fw)); } }; diff --git a/searchlib/src/vespa/searchlib/transactionlog/nosyncproxy.h b/searchlib/src/vespa/searchlib/transactionlog/nosyncproxy.h index a41b6c27c5d..9eccdbaff0e 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/nosyncproxy.h +++ b/searchlib/src/vespa/searchlib/transactionlog/nosyncproxy.h @@ -4,24 +4,16 @@ #include "syncproxy.h" -namespace search -{ -namespace transactionlog -{ +namespace search { +namespace transactionlog { class NoSyncProxy : public SyncProxy { public: - NoSyncProxy(void); - - virtual - ~NoSyncProxy(void); - - virtual void - sync(SerialNum syncTo) override; + NoSyncProxy(); + ~NoSyncProxy(); + void sync(SerialNum syncTo) override; }; } - } - diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogclient.h b/searchlib/src/vespa/searchlib/transactionlog/translogclient.h index e219f5cffbc..802933b7d81 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/translogclient.h +++ b/searchlib/src/vespa/searchlib/transactionlog/translogclient.h @@ -66,10 +66,10 @@ public: Subscriber(const vespalib::string & domain, TransLogClient & tlc, Callback & callBack); bool subscribe(const SerialNum & from); - virtual ~Subscriber(); - virtual RPC::Result visit(const Packet & packet) override { return _callback.receive(packet); } - virtual void inSync() override { _callback.inSync(); } - virtual void eof() override { _callback.eof(); } + ~Subscriber(); + RPC::Result visit(const Packet & packet) override { return _callback.receive(packet); } + void inSync() override { _callback.inSync(); } + void eof() override { _callback.eof(); } private: Callback & _callback; }; diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h index 8e64b17ecb4..105a6ca643b 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h +++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h @@ -41,7 +41,7 @@ public: uint64_t setDomainPartSize(); DomainStats getDomainStats() const; - virtual void commit(const vespalib::string & domainName, const Packet & packet) override; + void commit(const vespalib::string & domainName, const Packet & packet) override; class Session @@ -56,8 +56,8 @@ public: }; private: - virtual bool onStop() override; - virtual void run() override; + bool onStop() override; + void run() override; void exportRPC(FRT_Supervisor & supervisor); void relayToThreadRPC(FRT_RPCRequest *req); diff --git a/searchlib/src/vespa/searchlib/util/rand48.h b/searchlib/src/vespa/searchlib/util/rand48.h index d8bfa683f15..6d27d179a74 100644 --- a/searchlib/src/vespa/searchlib/util/rand48.h +++ b/searchlib/src/vespa/searchlib/util/rand48.h @@ -1,9 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -// Copyright (C) 2003 Fast Search & Transfer ASA -// Copyright (C) 2003 Overture Services Norway AS #pragma once +#include <cstdlib> +#include <cstdint> namespace search { @@ -26,14 +26,14 @@ public: { srand48(0x1234abcd); }; - void iterate(void) { + void iterate() { _state = (UINT64_C(0x5DEECE66D) * _state + 0xb) & UINT64_C(0xFFFFFFFFFFFF); } /* * Return value from 0 to 2^31 - 1 */ - long lrand48(void) { + long lrand48() { iterate(); return static_cast<long>(_state >> 17); } |