diff options
author | Arne Juul <arnej@verizonmedia.com> | 2020-12-01 15:10:59 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2020-12-02 14:14:12 +0000 |
commit | 919ec00a9948c24f645daafbaea94183cc931397 (patch) | |
tree | 11417c16a7ee0aa1274e1605e21e43b62ccad3ac /document | |
parent | 2966d36270a364b0d1421fa3c5dfffdca7a8a26d (diff) |
use SimpleValue instead of EngineOrFactory
Diffstat (limited to 'document')
3 files changed, 16 insertions, 13 deletions
diff --git a/document/src/tests/documentupdatetestcase.cpp b/document/src/tests/documentupdatetestcase.cpp index b88a0437fc2..3faec14ea7b 100644 --- a/document/src/tests/documentupdatetestcase.cpp +++ b/document/src/tests/documentupdatetestcase.cpp @@ -21,7 +21,8 @@ #include <vespa/document/update/tensor_remove_update.h> #include <vespa/document/update/valueupdate.h> #include <vespa/document/util/bytebuffer.h> -#include <vespa/eval/eval/engine_or_factory.h> +#include <vespa/eval/eval/simple_value.h> +#include <vespa/eval/eval/tensor_spec.h> #include <vespa/eval/eval/value.h> #include <vespa/eval/eval/test/value_compare.h> #include <vespa/vespalib/objects/nbostream.h> @@ -35,9 +36,9 @@ using namespace document::config_builder; +using vespalib::eval::SimpleValue; using vespalib::eval::TensorSpec; using vespalib::eval::ValueType; -using vespalib::eval::EngineOrFactory; using vespalib::nbostream; namespace document { @@ -775,7 +776,7 @@ TEST(DocumentUpdateTest, testMapValueUpdate) std::unique_ptr<vespalib::eval::Value> makeTensor(const TensorSpec &spec) { - return EngineOrFactory::get().from_spec(spec); + return SimpleValue::from_spec(spec); } std::unique_ptr<TensorFieldValue> diff --git a/document/src/tests/serialization/vespadocumentserializer_test.cpp b/document/src/tests/serialization/vespadocumentserializer_test.cpp index 05f1e9251db..0c9dfaf2e56 100644 --- a/document/src/tests/serialization/vespadocumentserializer_test.cpp +++ b/document/src/tests/serialization/vespadocumentserializer_test.cpp @@ -36,8 +36,9 @@ #include <vespa/document/serialization/vespadocumentdeserializer.h> #include <vespa/document/serialization/vespadocumentserializer.h> #include <vespa/document/serialization/annotationserializer.h> -#include <vespa/eval/eval/engine_or_factory.h> #include <vespa/eval/eval/value.h> +#include <vespa/eval/eval/simple_value.h> +#include <vespa/eval/eval/tensor_spec.h> #include <vespa/eval/eval/test/value_compare.h> #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/objects/nbostream.h> @@ -51,7 +52,7 @@ using vespalib::nbostream; using vespalib::nbostream_longlivedbuf; using vespalib::slime::Cursor; using vespalib::eval::TensorSpec; -using vespalib::eval::EngineOrFactory; +using vespalib::eval::SimpleValue; using vespalib::compression::CompressionConfig; using namespace document; using std::string; @@ -772,7 +773,7 @@ namespace { vespalib::eval::Value::UP createTensor(const TensorSpec &spec) { - return EngineOrFactory::get().from_spec(spec); + return SimpleValue::from_spec(spec); } } @@ -838,7 +839,7 @@ void checkDeserialization(const string &name, std::unique_ptr<vespalib::eval::Va TensorDataType valueType(tensor ? tensor->type() : vespalib::eval::ValueType::error_type()); TensorFieldValue value(valueType); if (tensor) { - value = EngineOrFactory::get().copy(*tensor); + value = std::move(tensor); } serializeToFile(value, data_dir + name + "__cpp"); deserializeAndCheck(data_dir + name + "__cpp", value); @@ -877,7 +878,7 @@ TensorDocFixture::TensorDocFixture(const DocumentTypeRepo &docTypeRepo, _blob() { auto fv = _doc.getField(tensor_field_name).createValue(); - dynamic_cast<TensorFieldValue &>(*fv) = EngineOrFactory::get().copy(*_tensor); + dynamic_cast<TensorFieldValue &>(*fv) = SimpleValue::from_value(*_tensor); _doc.setValue(tensor_field_name, *fv); _doc.serialize(_blob); } diff --git a/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp b/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp index 067cf4ac649..092190a427b 100644 --- a/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp +++ b/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp @@ -7,15 +7,16 @@ LOG_SETUP("fieldvalue_test"); #include <vespa/document/base/exceptions.h> #include <vespa/document/datatype/tensor_data_type.h> #include <vespa/document/fieldvalue/tensorfieldvalue.h> -#include <vespa/eval/eval/engine_or_factory.h> +#include <vespa/eval/eval/simple_value.h> +#include <vespa/eval/eval/tensor_spec.h> #include <vespa/eval/eval/value.h> #include <vespa/vespalib/testkit/testapp.h> using namespace document; +using vespalib::eval::SimpleValue; using vespalib::eval::TensorSpec; using vespalib::eval::ValueType; -using vespalib::eval::EngineOrFactory; namespace { @@ -24,14 +25,14 @@ TensorDataType xSparseTensorDataType(ValueType::from_spec("tensor(x{})")); TensorDataType xySparseTensorDataType(ValueType::from_spec("tensor(x{},y{})")); vespalib::eval::Value::UP createTensor(const TensorSpec &spec) { - return EngineOrFactory::get().from_spec(spec); + return SimpleValue::from_spec(spec); } std::unique_ptr<vespalib::eval::Value> makeSimpleTensor() { - return EngineOrFactory::get().from_spec(TensorSpec("tensor(x{},y{})"). - add({{"x", "4"}, {"y", "5"}}, 7)); + return SimpleValue::from_spec(TensorSpec("tensor(x{},y{})"). + add({{"x", "4"}, {"y", "5"}}, 7)); } FieldValue::UP clone(FieldValue &fv) { |