diff options
author | Tor Egge <Tor.Egge@yahooinc.com> | 2023-04-18 15:26:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-18 15:26:06 +0200 |
commit | 38040357527c9bab9951c59ee1687520e677b422 (patch) | |
tree | 162eed83f9abce86206b79c7a6a2c858808851c0 | |
parent | b31fc1f1ae7ac6dac7cc09987c814d0c5e0e1b3c (diff) | |
parent | b17bc1e9745b4bd3619f2d8b60cc9c86fc9a7b68 (diff) |
Merge pull request #26769 from vespa-engine/toregge/the-reserved-document-for-a-multivalue-attribute-vector-should-have-an-empty-vector
The reserved document for a multivalue attribute vector should have an
-rw-r--r-- | searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp | 6 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/attribute/attributevector.cpp | 13 |
2 files changed, 1 insertions, 18 deletions
diff --git a/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp b/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp index 4af23a1d7fb..d2798c16065 100644 --- a/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp @@ -277,11 +277,7 @@ TEST("require that reserved document is reinitialized during load") auto read_view = mvav->make_read_view(IMultiValueAttribute::WeightedSetTag<const char*>(), stash); ASSERT_TRUE(read_view != nullptr); auto reserved_values = read_view->get_values(0u); - EXPECT_EQUAL(1u, reserved_values.size()); - if (reserved_values.size() >= 1) { - EXPECT_EQUAL(1, reserved_values[0].weight()); - EXPECT_EQUAL(vespalib::string(""), vespalib::string(reserved_values[0].value())); - } + EXPECT_EQUAL(0u, reserved_values.size()); } } diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp index 9110c08099a..f4ab447ed51 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp +++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp @@ -453,19 +453,6 @@ AttributeVector::set_reserved_doc_values() return; } clearDoc(docId); - if (hasMultiValue()) { - if (isFloatingPointType()) { - auto * vec = dynamic_cast<FloatingPointAttribute *>(this); - bool appendedUndefined = vec->append(0, attribute::getUndefined<double>(), 1); - assert(appendedUndefined); - (void) appendedUndefined; - } else if (isStringType()) { - auto * vec = dynamic_cast<StringAttribute *>(this); - bool appendedUndefined = vec->append(0, StringAttribute::defaultValue(), 1); - assert(appendedUndefined); - (void) appendedUndefined; - } - } commit(); } |