engine.encode -> encode_value

8 files changed, 16 insertions, 19 deletions

diff --git a/document/src/vespa/document/serialization/vespadocumentserializer.cpp b/document/src/vespa/document/serialization/vespadocumentserializer.cpp
index 882dc4e83f3..9b8fe6b120a 100644
--- a/document/src/vespa/document/serialization/vespadocumentserializer.cpp
+++ b/document/src/vespa/document/serialization/vespadocumentserializer.cpp
@@ -27,7 +27,7 @@
 #include <vespa/document/update/updates.h>
 #include <vespa/document/util/bytebuffer.h>
 #include <vespa/eval/eval/value.h>
-#include <vespa/eval/eval/engine_or_factory.h>
+#include <vespa/eval/eval/value_codec.h>
 #include <vespa/vespalib/data/databuffer.h>
 #include <vespa/vespalib/data/slime/binary_format.h>
 #include <vespa/vespalib/objects/nbostream.h>
@@ -371,7 +371,7 @@ VespaDocumentSerializer::write(const TensorFieldValue &value) {
     vespalib::nbostream tmpStream;
     auto tensor = value.getAsTensorPtr();
     if (tensor) {
-        vespalib::eval::EngineOrFactory::get().encode(*tensor, tmpStream);
+        encode_value(*tensor, tmpStream);
         assert( ! tmpStream.empty());
         _stream.putInt1_4Bytes(tmpStream.size());
         _stream.write(tmpStream.peek(), tmpStream.size());
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.cpp
index ecca993fa27..0d432c069c9 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.cpp
@@ -3,7 +3,7 @@
 #include "documentstoreadapter.h"
 #include <vespa/searchsummary/docsummary/summaryfieldconverter.h>
 #include <vespa/document/fieldvalue/stringfieldvalue.h>
-#include <vespa/eval/eval/engine_or_factory.h>
+#include <vespa/eval/eval/value_codec.h>
 #include <vespa/vespalib/objects/nbostream.h>
 #include <vespa/document/fieldvalue/tensorfieldvalue.h>
 
@@ -86,7 +86,7 @@ DocumentStoreAdapter::writeField(const FieldValue &value, ResType type)
                 const auto &tvalue = static_cast<const TensorFieldValue &>(value);
                 auto tensor = tvalue.getAsTensorPtr();
                 if (tensor) {
-                    vespalib::eval::EngineOrFactory::get().encode(*tensor, serialized);
+                    encode_value(*tensor, serialized);
                 }
             }
             return _resultPacker.AddSerializedTensor(serialized.peek(), serialized.size());
diff --git a/searchcore/src/vespa/searchcore/proton/matching/docsum_matcher.cpp b/searchcore/src/vespa/searchcore/proton/matching/docsum_matcher.cpp
index a7a74de35d9..f3fc0cac326 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/docsum_matcher.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/docsum_matcher.cpp
@@ -3,9 +3,7 @@
 #include "docsum_matcher.h"
 #include "match_tools.h"
 #include "search_session.h"
-#include <vespa/eval/eval/tensor.h>
-#include <vespa/eval/eval/tensor_engine.h>
-#include <vespa/eval/eval/engine_or_factory.h>
+#include <vespa/eval/eval/value_codec.h>
 #include <vespa/vespalib/objects/nbostream.h>
 #include <vespa/searchcommon/attribute/i_search_context.h>
 #include <vespa/searchlib/queryeval/blueprint.h>
@@ -74,7 +72,7 @@ get_feature_set(const MatchToolsFactory &mtf,
                     auto obj = resolver.resolve(j).as_object(docId);
                     if (! obj.get().type().is_double()) {
                         vespalib::nbostream buf;
-                        vespalib::eval::EngineOrFactory::get().encode(obj.get(), buf);
+                        encode_value(obj.get(), buf);
                         f[j].set_data(vespalib::Memory(buf.peek(), buf.size()));
                     } else {
                         f[j].set_double(obj.get().as_double());
diff --git a/searchlib/src/vespa/searchlib/tensor/direct_tensor_saver.cpp b/searchlib/src/vespa/searchlib/tensor/direct_tensor_saver.cpp
index 9e0163d610f..b4b41187c8f 100644
--- a/searchlib/src/vespa/searchlib/tensor/direct_tensor_saver.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/direct_tensor_saver.cpp
@@ -3,7 +3,7 @@
 #include "direct_tensor_saver.h"
 #include "direct_tensor_store.h"
 
-#include <vespa/eval/eval/engine_or_factory.h>
+#include <vespa/eval/eval/value_codec.h>
 #include <vespa/searchlib/attribute/iattributesavetarget.h>
 #include <vespa/searchlib/util/bufferwriter.h>
 #include <vespa/vespalib/objects/nbostream.h>
@@ -38,7 +38,7 @@ DirectTensorAttributeSaver::onSave(IAttributeSaveTarget &saveTarget)
         const vespalib::eval::Value *tensor = _tensorStore.get_tensor(_refs[lid]);
         if (tensor) {
             stream.clear();
-            vespalib::eval::EngineOrFactory::get().encode(*tensor, stream);
+            encode_value(*tensor, stream);
             uint32_t sz = stream.size();
             datWriter->write(&sz, sizeof(sz));
             datWriter->write(stream.peek(), stream.size());
diff --git a/searchlib/src/vespa/searchlib/tensor/serialized_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/serialized_tensor_store.cpp
index 2b3514fa352..7045c82935c 100644
--- a/searchlib/src/vespa/searchlib/tensor/serialized_tensor_store.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/serialized_tensor_store.cpp
@@ -2,8 +2,8 @@
 
 #include "serialized_tensor_store.h"
 #include "tensor_deserialize.h"
-#include <vespa/eval/eval/engine_or_factory.h>
 #include <vespa/eval/eval/value.h>
+#include <vespa/eval/eval/value_codec.h>
 #include <vespa/vespalib/datastore/datastore.hpp>
 #include <vespa/vespalib/objects/nbostream.h>
 #include <vespa/vespalib/util/stringfmt.h>
@@ -99,7 +99,7 @@ TensorStore::EntryRef
 SerializedTensorStore::setTensor(const vespalib::eval::Value &tensor)
 {
     vespalib::nbostream stream;
-    vespalib::eval::EngineOrFactory::get().encode(tensor, stream);
+    encode_value(tensor, stream);
     auto raw = allocRawBuffer(stream.size());
     memcpy(raw.data, stream.peek(), stream.size());
     return raw.ref;
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()));
     }
diff --git a/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp b/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
index 12dce7d376c..b0cb058d762 100644
--- a/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
@@ -4,7 +4,7 @@
 #include <vespa/searchlib/fef/feature_resolver.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <algorithm>
-#include <vespa/eval/eval/engine_or_factory.h>
+#include <vespa/eval/eval/value_codec.h>
 #include <vespa/vespalib/objects/nbostream.h>
 
 #include <vespa/log/log.h>
@@ -164,7 +164,7 @@ HitCollector::getFeatureSet(IRankProgram &rankProgram,
                 auto obj = resolver.resolve(j).as_object(docId);
                 if (! obj.get().is_double()) {
                     vespalib::nbostream buf;
-                    vespalib::eval::EngineOrFactory::get().encode(obj.get(), buf);
+                    encode_value(obj.get(), buf);
                     f[j].set_data(vespalib::Memory(buf.peek(), buf.size()));
                 } else {
                     f[j].set_double(obj.get().as_double());