diff options
author | Arne Juul <arnej@verizonmedia.com> | 2020-12-02 14:35:22 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2020-12-02 20:06:02 +0000 |
commit | 4b636a18fa7e1a4c483942f87ba4b4134df78b79 (patch) | |
tree | 1cbedcd9abfb8883a3ab3b1e74672defb3f17d0f /searchsummary | |
parent | ed58cd5826de9da0ed6a963a35c1246abebac1e4 (diff) |
engine.encode -> encode_value
Diffstat (limited to 'searchsummary')
-rw-r--r-- | searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp | 5 | ||||
-rw-r--r-- | searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp index dd1b6f95618..65b262a85f2 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp @@ -3,8 +3,8 @@ #include "attributedfw.h" #include "docsumstate.h" #include "docsumwriter.h" -#include <vespa/eval/eval/engine_or_factory.h> #include <vespa/eval/eval/value.h> +#include <vespa/eval/eval/value_codec.h> #include <vespa/searchcommon/attribute/iattributecontext.h> #include <vespa/searchlib/attribute/iattributemanager.h> #include <vespa/searchlib/attribute/integerbase.h> @@ -25,7 +25,6 @@ using search::attribute::IAttributeVector; using vespalib::Memory; using vespalib::slime::Cursor; using vespalib::slime::Inserter; -using vespalib::eval::EngineOrFactory; using vespalib::eval::Value; namespace search::docsummary { @@ -106,7 +105,7 @@ SingleAttrDFW::insertField(uint32_t docid, GetDocsumsState * state, ResType type const auto tensor = tv->getTensor(docid); if (tensor) { vespalib::nbostream str; - EngineOrFactory::get().encode(*tensor, str); + encode_value(*tensor, str); target.insertData(vespalib::Memory(str.peek(), str.size())); } } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp index 604e1b4c413..9df6328d4fe 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp @@ -24,6 +24,7 @@ #include <vespa/document/fieldvalue/annotationreferencefieldvalue.h> #include <vespa/document/fieldvalue/tensorfieldvalue.h> #include <vespa/document/fieldvalue/referencefieldvalue.h> +#include <vespa/eval/eval/value_codec.h> #include <vespa/searchcommon/common/schema.h> #include <vespa/searchlib/util/url.h> #include <vespa/vespalib/encoding/base64.h> @@ -31,7 +32,6 @@ #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/data/slime/slime.h> -#include <vespa/eval/eval/engine_or_factory.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h> #include <vespa/vespalib/util/exceptions.h> @@ -510,7 +510,7 @@ private: const auto &tensor = value.getAsTensorPtr(); vespalib::nbostream s; if (tensor) { - vespalib::eval::EngineOrFactory::get().encode(*tensor, s); + encode_value(*tensor, s); } _inserter.insertData(vespalib::Memory(s.peek(), s.size())); } |