diff options
author | Haavard <havardpe@yahoo-inc.com> | 2017-02-09 14:44:10 +0000 |
---|---|---|
committer | Haavard <havardpe@yahoo-inc.com> | 2017-02-10 16:07:47 +0000 |
commit | a9e64013b4db64cb6ec86be6dcc0076282ab8858 (patch) | |
tree | ca16fa7cb4d1efe5a4ccbf8380e235bf15b8baa6 /searchlib | |
parent | 461694eed494a7dc0f365725439beee2089eaec5 (diff) |
wire in immediate evaluation of new syntax
Diffstat (limited to 'searchlib')
-rw-r--r-- | searchlib/src/apps/vespa-ranking-expression-analyzer/vespa-ranking-expression-analyzer.cpp | 2 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/features/rankingexpressionfeature.cpp | 8 |
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 55f3154a43f..941b0377a97 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 @@ -165,7 +165,7 @@ struct FunctionInfo { size_t path = 0; for (const Node *tree: trees) { InterpretedFunction ifun(DefaultTensorEngine::ref(), *tree, params.size(), NodeTypes()); - InterpretedFunction::Context ctx; + InterpretedFunction::Context ctx(ifun); for (double param: params) { ctx.add_param(param); } diff --git a/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.cpp b/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.cpp index e11bd4d264d..cc8238a50a1 100644 --- a/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/rankingexpressionfeature.cpp @@ -71,9 +71,9 @@ public: class InterpretedRankingExpressionExecutor : public fef::FeatureExecutor { private: - InterpretedFunction::Context _context; const InterpretedFunction &_function; const ConstArrayRef<char> _input_is_object; + InterpretedFunction::Context _context; public: InterpretedRankingExpressionExecutor(const InterpretedFunction &function, @@ -102,9 +102,9 @@ CompiledRankingExpressionExecutor::execute(uint32_t) InterpretedRankingExpressionExecutor::InterpretedRankingExpressionExecutor(const InterpretedFunction &function, ConstArrayRef<char> input_is_object) - : _context(), - _function(function), - _input_is_object(input_is_object) + : _function(function), + _input_is_object(input_is_object), + _context(function) { } |