diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-10-12 13:14:55 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-10-12 13:14:55 +0000 |
| commit | 488788225bc14663e183d6246dfa5a0338770b55 (patch) | |
| tree | 69eb1ac72b0e16ef0f8a40acddf2af5623a7451d /searchcore | |
| parent | 9512873b312a5348e29662c1bcd0e07a385c44e1 (diff) | |
Consider the execute instructions comming in the rankprofiles config too.
Diffstat (limited to 'searchcore')
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp index 6a2e4988b2b..ba812e6c79e 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp @@ -6,11 +6,9 @@ #include <vespa/searchlib/fef/indexproperties.h> #include <vespa/searchlib/fef/ranksetup.h> #include <vespa/searchlib/engine/trace.h> -#include <vespa/searchlib/parsequery/stackdumpiterator.h> #include <vespa/searchlib/attribute/diversity.h> #include <vespa/searchlib/attribute/attribute_operation.h> #include <vespa/searchlib/attribute/attribute_blueprint_params.h> -#include <vespa/searchlib/common/bitvector.h> #include <vespa/log/log.h> LOG_SETUP(".proton.matching.match_tools"); @@ -252,18 +250,18 @@ MatchToolsFactory::createTask(vespalib::stringref attribute, vespalib::stringref } std::unique_ptr<AttributeOperationTask> MatchToolsFactory::createOnMatchTask() const { - return createTask(execute::onmatch::Attribute::lookup(_queryEnv.getProperties()), - execute::onmatch::Operation::lookup(_queryEnv.getProperties())); + return createTask(execute::onmatch::Attribute::lookup(_queryEnv.getProperties(), _rankSetup.getExecuteOnMatch()._attribute), + execute::onmatch::Operation::lookup(_queryEnv.getProperties(), _rankSetup.getExecuteOnMatch()._operation)); } std::unique_ptr<AttributeOperationTask> MatchToolsFactory::createOnReRankTask() const { - return createTask(execute::onrerank::Attribute::lookup(_queryEnv.getProperties()), - execute::onrerank::Operation::lookup(_queryEnv.getProperties())); + return createTask(execute::onrerank::Attribute::lookup(_queryEnv.getProperties(), _rankSetup.getExecuteOnReRank()._attribute), + execute::onrerank::Operation::lookup(_queryEnv.getProperties(), _rankSetup.getExecuteOnReRank()._operation)); } std::unique_ptr<AttributeOperationTask> MatchToolsFactory::createOnSummaryTask() const { - return createTask(execute::onsummary::Attribute::lookup(_queryEnv.getProperties()), - execute::onsummary::Operation::lookup(_queryEnv.getProperties())); + return createTask(execute::onsummary::Attribute::lookup(_queryEnv.getProperties(), _rankSetup.getExecuteOnSummary()._attribute), + execute::onsummary::Operation::lookup(_queryEnv.getProperties(), _rankSetup.getExecuteOnSummary()._operation)); } bool |