summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2019-03-11 19:26:18 +0100
committerTor Egge <Tor.Egge@broadpark.no>2019-03-11 19:26:18 +0100
commit8dd6e095f7f526e5a85db146415abfd9bfa635ff (patch)
tree23c87841f2be4832afb0528bbc17fff66df02bc9 /searchcore
parent48ce50681ad29a1a17446dbb1f0413615ca35725 (diff)
Stop using tensor mapper when setting values in tensor attribute.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp2
-rw-r--r--searchcore/src/vespa/searchcore/proton/test/attribute_utils.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
index b390edfda88..7182bd1ab16 100644
--- a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
@@ -771,7 +771,7 @@ TEST_F("require that imported attributes are exposed via attribute context toget
TEST_F("require that attribute vector of wrong type is dropped", BaseFixture)
{
AVConfig generic_tensor(BasicType::TENSOR);
- generic_tensor.setTensorType(ValueType::tensor_type({}));
+ generic_tensor.setTensorType(ValueType::from_spec("tensor(x{})"));
AVConfig dense_tensor(BasicType::TENSOR);
dense_tensor.setTensorType(ValueType::from_spec("tensor(x[10])"));
AVConfig predicate(BasicType::PREDICATE);
diff --git a/searchcore/src/vespa/searchcore/proton/test/attribute_utils.h b/searchcore/src/vespa/searchcore/proton/test/attribute_utils.h
index f1d661a3ad0..266c439c6fd 100644
--- a/searchcore/src/vespa/searchcore/proton/test/attribute_utils.h
+++ b/searchcore/src/vespa/searchcore/proton/test/attribute_utils.h
@@ -46,7 +46,7 @@ struct AttributeUtils
return search::attribute::Config(search::attribute::BasicType::PREDICATE);
}
static search::attribute::Config getTensorConfig() {
- return search::attribute::Config(search::attribute::BasicType::TENSOR);
+ return search::attribute::Config(search::attribute::BasicType::TENSOR).setTensorType(vespalib::eval::ValueType::from_spec("tensor(x{},y{})"));
}
};