diff options
author | Arne H Juul <arnej27959@users.noreply.github.com> | 2020-12-03 19:12:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-03 19:12:22 +0100 |
commit | f88b7e59d00a59b623221d453e24c74e5b26c677 (patch) | |
tree | cfedc9b00df8bcbc5cad534d28c554639a3b5d2f /searchlib | |
parent | 34de8912bdfd669141633fef0d4ecd8f64830839 (diff) | |
parent | 78b6e23e5de6b80ef73fabb69bc76627ee642de4 (diff) |
Merge pull request #15646 from vespa-engine/havardpe/only-factory-in-interpreted-function
only factory in interpreted function
Diffstat (limited to 'searchlib')
-rw-r--r-- | searchlib/src/apps/vespa-ranking-expression-analyzer/vespa-ranking-expression-analyzer.cpp | 4 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/features/rankingexpressionfeature.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/searchlib/src/apps/vespa-ranking-expression-analyzer/vespa-ranking-expression-analyzer.cpp b/searchlib/src/apps/vespa-ranking-expression-analyzer/vespa-ranking-expression-analyzer.cpp index 66fa28aa1ad..f2a9ee2932f 100644 --- a/searchlib/src/apps/vespa-ranking-expression-analyzer/vespa-ranking-expression-analyzer.cpp +++ b/searchlib/src/apps/vespa-ranking-expression-analyzer/vespa-ranking-expression-analyzer.cpp @@ -4,12 +4,12 @@ #include <vespa/eval/eval/llvm/compiled_function.h> #include <vespa/eval/eval/interpreted_function.h> #include <vespa/eval/eval/call_nodes.h> +#include <vespa/eval/eval/fast_value.h> #include <vespa/eval/eval/operator_nodes.h> #include <vespa/vespalib/util/benchmark_timer.h> #include <vespa/eval/eval/vm_forest.h> #include <vespa/eval/eval/fast_forest.h> #include <vespa/eval/eval/llvm/deinline_forest.h> -#include <vespa/eval/eval/engine_or_factory.h> #include <vespa/vespalib/io/mapped_file_input.h> #include <vespa/eval/eval/param_usage.h> #include <vespa/fastos/app.h> @@ -153,7 +153,7 @@ struct FunctionInfo { size_t get_path_len(const TreeList &trees) const { size_t path = 0; for (const Node *tree: trees) { - InterpretedFunction ifun(EngineOrFactory::get(), *tree, NodeTypes()); + InterpretedFunction ifun(FastValueBuilderFactory::get(), *tree, NodeTypes()); InterpretedFunction::Context ctx(ifun); SimpleParams fun_params(params); ifun.eval(ctx, fun_params); diff --git a/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.cpp b/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.cpp index f53bffea249..8cba6013627 100644 --- a/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.cpp @@ -5,8 +5,8 @@ #include <vespa/searchlib/fef/properties.h> #include <vespa/searchlib/fef/indexproperties.h> #include <vespa/searchlib/features/rankingexpression/feature_name_extractor.h> -#include <vespa/eval/eval/engine_or_factory.h> #include <vespa/eval/eval/param_usage.h> +#include <vespa/eval/eval/fast_value.h> #include <vespa/log/log.h> LOG_SETUP(".features.rankingexpression"); @@ -17,7 +17,7 @@ using vespalib::ConstArrayRef; using vespalib::eval::CompileCache; using vespalib::eval::CompiledFunction; using vespalib::eval::DoubleValue; -using vespalib::eval::EngineOrFactory; +using vespalib::eval::FastValueBuilderFactory; using vespalib::eval::Function; using vespalib::eval::InterpretedFunction; using vespalib::eval::LazyParams; @@ -325,7 +325,7 @@ RankingExpressionBlueprint::setup(const fef::IIndexEnvironment &env, } } } else { - _interpreted_function.reset(new InterpretedFunction(EngineOrFactory::get(), + _interpreted_function.reset(new InterpretedFunction(FastValueBuilderFactory::get(), *rank_function, node_types)); } } |