diff options
4 files changed, 62 insertions, 90 deletions
diff --git a/searchlib/src/vespa/searchlib/features/debug_attribute_wait.cpp b/searchlib/src/vespa/searchlib/features/debug_attribute_wait.cpp index 3c543624397..23cea2275f3 100644 --- a/searchlib/src/vespa/searchlib/features/debug_attribute_wait.cpp +++ b/searchlib/src/vespa/searchlib/features/debug_attribute_wait.cpp @@ -8,13 +8,30 @@ LOG_SETUP(".features.debug_wait"); using search::attribute::IAttributeVector; namespace search { + +using namespace fef; + namespace features { //----------------------------------------------------------------------------- -DebugAttributeWaitExecutor::DebugAttributeWaitExecutor(const search::fef::IQueryEnvironment &env, - const IAttributeVector *attribute, - const DebugAttributeWaitParams ¶ms) +class DebugAttributeWaitExecutor : public FeatureExecutor +{ +private: + const IAttributeVector *_attribute; + attribute::FloatContent _buf; + DebugAttributeWaitParams _params; + +public: + DebugAttributeWaitExecutor(const IQueryEnvironment &env, + const IAttributeVector * attribute, + const DebugAttributeWaitParams ¶ms); + void execute(MatchData & data) override; +}; + +DebugAttributeWaitExecutor::DebugAttributeWaitExecutor(const IQueryEnvironment &env, + const IAttributeVector *attribute, + const DebugAttributeWaitParams ¶ms) : _attribute(attribute), _buf(), _params(params) @@ -23,7 +40,7 @@ DebugAttributeWaitExecutor::DebugAttributeWaitExecutor(const search::fef::IQuery } void -DebugAttributeWaitExecutor::execute(search::fef::MatchData &data) +DebugAttributeWaitExecutor::execute(MatchData &data) { double waitTime = 0.0; FastOS_Time time; @@ -56,22 +73,20 @@ DebugAttributeWaitBlueprint::DebugAttributeWaitBlueprint() } void -DebugAttributeWaitBlueprint::visitDumpFeatures(const search::fef::IIndexEnvironment &env, - search::fef::IDumpFeatureVisitor &visitor) const +DebugAttributeWaitBlueprint::visitDumpFeatures(const IIndexEnvironment &env, IDumpFeatureVisitor &visitor) const { (void)env; (void)visitor; } -search::fef::Blueprint::UP +Blueprint::UP DebugAttributeWaitBlueprint::createInstance() const { return Blueprint::UP(new DebugAttributeWaitBlueprint()); } bool -DebugAttributeWaitBlueprint::setup(const search::fef::IIndexEnvironment &env, - const search::fef::ParameterList ¶ms) +DebugAttributeWaitBlueprint::setup(const IIndexEnvironment &env, const ParameterList ¶ms) { (void)env; _attribute = params[0].getValue(); @@ -82,12 +97,12 @@ DebugAttributeWaitBlueprint::setup(const search::fef::IIndexEnvironment &env, return true; } -search::fef::FeatureExecutor::LP -DebugAttributeWaitBlueprint::createExecutor(const search::fef::IQueryEnvironment &env) const +FeatureExecutor::LP +DebugAttributeWaitBlueprint::createExecutor(const IQueryEnvironment &env) const { // Get attribute vector const IAttributeVector * attribute = env.getAttributeContext().getAttribute(_attribute); - return search::fef::FeatureExecutor::LP(new DebugAttributeWaitExecutor(env, attribute, _params)); + return FeatureExecutor::LP(new DebugAttributeWaitExecutor(env, attribute, _params)); } //----------------------------------------------------------------------------- diff --git a/searchlib/src/vespa/searchlib/features/debug_attribute_wait.h b/searchlib/src/vespa/searchlib/features/debug_attribute_wait.h index d7043ce9f30..de0df9cee2d 100644 --- a/searchlib/src/vespa/searchlib/features/debug_attribute_wait.h +++ b/searchlib/src/vespa/searchlib/features/debug_attribute_wait.h @@ -18,24 +18,7 @@ struct DebugAttributeWaitParams { //----------------------------------------------------------------------------- -class DebugAttributeWaitExecutor : public search::fef::FeatureExecutor -{ -private: - const search::attribute::IAttributeVector *_attribute; - search::attribute::FloatContent _buf; - DebugAttributeWaitParams _params; - -public: - DebugAttributeWaitExecutor(const search::fef::IQueryEnvironment &env, - const search::attribute::IAttributeVector * - attribute, - const DebugAttributeWaitParams ¶ms); - virtual void execute(search::fef::MatchData & data); -}; - -//----------------------------------------------------------------------------- - -class DebugAttributeWaitBlueprint : public search::fef::Blueprint +class DebugAttributeWaitBlueprint : public fef::Blueprint { private: vespalib::string _attribute; @@ -43,25 +26,13 @@ private: public: DebugAttributeWaitBlueprint(); - - // Inherit doc from Blueprint. - virtual void visitDumpFeatures(const search::fef::IIndexEnvironment & env, - search::fef::IDumpFeatureVisitor & visitor) const; - - // Inherit doc from Blueprint. - virtual search::fef::Blueprint::UP createInstance() const; - - // Inherit doc from Blueprint. - virtual search::fef::ParameterDescriptions getDescriptions() const { - return search::fef::ParameterDescriptions().desc().attribute(search::fef::ParameterCollection::ANY).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().attribute(fef::ParameterCollection::ANY).number(); } - - // Inherit doc from Blueprint. - virtual bool setup(const search::fef::IIndexEnvironment &env, - const search::fef::ParameterList ¶ms); - - // Inherit doc from Blueprint. - virtual search::fef::FeatureExecutor::LP createExecutor(const search::fef::IQueryEnvironment & env) const; + bool setup(const fef::IIndexEnvironment &env, const fef::ParameterList ¶ms) override; + fef::FeatureExecutor::LP createExecutor(const fef::IQueryEnvironment & env) const override; }; //----------------------------------------------------------------------------- diff --git a/searchlib/src/vespa/searchlib/features/debug_wait.cpp b/searchlib/src/vespa/searchlib/features/debug_wait.cpp index 58fb7925a74..f3aa00ec206 100644 --- a/searchlib/src/vespa/searchlib/features/debug_wait.cpp +++ b/searchlib/src/vespa/searchlib/features/debug_wait.cpp @@ -6,19 +6,31 @@ LOG_SETUP(".features.debug_wait"); #include "debug_wait.h" namespace search { + +using namespace fef; + namespace features { //----------------------------------------------------------------------------- -DebugWaitExecutor::DebugWaitExecutor(const search::fef::IQueryEnvironment &env, - const DebugWaitParams ¶ms) +class DebugWaitExecutor : public FeatureExecutor +{ +private: + DebugWaitParams _params; + +public: + DebugWaitExecutor(const IQueryEnvironment &env, const DebugWaitParams ¶ms); + void execute(MatchData & data) override; +}; + +DebugWaitExecutor::DebugWaitExecutor(const IQueryEnvironment &env, const DebugWaitParams ¶ms) : _params(params) { (void)env; } void -DebugWaitExecutor::execute(search::fef::MatchData &data) +DebugWaitExecutor::execute(MatchData &data) { FastOS_Time time; time.SetNow(); @@ -45,22 +57,20 @@ DebugWaitBlueprint::DebugWaitBlueprint() } void -DebugWaitBlueprint::visitDumpFeatures(const search::fef::IIndexEnvironment &env, - search::fef::IDumpFeatureVisitor &visitor) const +DebugWaitBlueprint::visitDumpFeatures(const IIndexEnvironment &env, IDumpFeatureVisitor &visitor) const { (void)env; (void)visitor; } -search::fef::Blueprint::UP +Blueprint::UP DebugWaitBlueprint::createInstance() const { return Blueprint::UP(new DebugWaitBlueprint()); } bool -DebugWaitBlueprint::setup(const search::fef::IIndexEnvironment &env, - const search::fef::ParameterList ¶ms) +DebugWaitBlueprint::setup(const IIndexEnvironment &env, const ParameterList ¶ms) { (void)env; _params.waitTime = params[0].asDouble(); @@ -70,10 +80,10 @@ DebugWaitBlueprint::setup(const search::fef::IIndexEnvironment &env, return true; } -search::fef::FeatureExecutor::LP -DebugWaitBlueprint::createExecutor(const search::fef::IQueryEnvironment &env) const +FeatureExecutor::LP +DebugWaitBlueprint::createExecutor(const IQueryEnvironment &env) const { - return search::fef::FeatureExecutor::LP(new DebugWaitExecutor(env, _params)); + return FeatureExecutor::LP(new DebugWaitExecutor(env, _params)); } //----------------------------------------------------------------------------- diff --git a/searchlib/src/vespa/searchlib/features/debug_wait.h b/searchlib/src/vespa/searchlib/features/debug_wait.h index 69c7612381b..73dd33d311c 100644 --- a/searchlib/src/vespa/searchlib/features/debug_wait.h +++ b/searchlib/src/vespa/searchlib/features/debug_wait.h @@ -18,20 +18,7 @@ struct DebugWaitParams { //----------------------------------------------------------------------------- -class DebugWaitExecutor : public search::fef::FeatureExecutor -{ -private: - DebugWaitParams _params; - -public: - DebugWaitExecutor(const search::fef::IQueryEnvironment &env, - const DebugWaitParams ¶ms); - virtual void execute(search::fef::MatchData & data); -}; - -//----------------------------------------------------------------------------- - -class DebugWaitBlueprint : public search::fef::Blueprint +class DebugWaitBlueprint : public fef::Blueprint { private: DebugWaitParams _params; @@ -39,24 +26,13 @@ private: public: DebugWaitBlueprint(); - // Inherit doc from Blueprint. - virtual void visitDumpFeatures(const search::fef::IIndexEnvironment & env, - search::fef::IDumpFeatureVisitor & visitor) const; - - // Inherit doc from Blueprint. - virtual search::fef::Blueprint::UP createInstance() const; - - // Inherit doc from Blueprint. - virtual search::fef::ParameterDescriptions getDescriptions() const { - return search::fef::ParameterDescriptions().desc().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().number().number(); } - - // Inherit doc from Blueprint. - virtual bool setup(const search::fef::IIndexEnvironment &env, - const search::fef::ParameterList ¶ms); - - // Inherit doc from Blueprint. - virtual search::fef::FeatureExecutor::LP createExecutor(const search::fef::IQueryEnvironment & env) const; + bool setup(const fef::IIndexEnvironment &env, const fef::ParameterList ¶ms) override; + fef::FeatureExecutor::LP createExecutor(const fef::IQueryEnvironment & env) const override; }; //----------------------------------------------------------------------------- |