diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-09-24 12:23:34 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-09-24 12:23:34 +0200 |
commit | 9f4437155a3d76442883e61eba9d092064e00eb4 (patch) | |
tree | c1ebb010bf25e75db5b89399d76c4ab4e328cf02 /searchlib/src | |
parent | ab7dd8723943a46c880d858d81cb4d47e0cac5f8 (diff) |
Adjust reference count for default value enum store entry when shrinking a
single value enumerated attribute.
Diffstat (limited to 'searchlib/src')
-rw-r--r-- | searchlib/src/tests/attribute/attribute_test.cpp | 41 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp | 11 |
2 files changed, 52 insertions, 0 deletions
diff --git a/searchlib/src/tests/attribute/attribute_test.cpp b/searchlib/src/tests/attribute/attribute_test.cpp index 98caf39dace..97d7bfd5e0e 100644 --- a/searchlib/src/tests/attribute/attribute_test.cpp +++ b/searchlib/src/tests/attribute/attribute_test.cpp @@ -15,6 +15,7 @@ #include <vespa/searchlib/attribute/multistringattribute.h> #include <vespa/searchlib/attribute/predicate_attribute.h> #include <vespa/searchlib/attribute/singlenumericattribute.h> +#include <vespa/searchlib/attribute/singlenumericpostattribute.h> #include <vespa/searchlib/attribute/singlestringattribute.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/util/randomgenerator.h> @@ -241,6 +242,8 @@ private: void testCompactLidSpace(); + void test_shrink_lid_space(); + template <typename AttributeType> void requireThatAddressSpaceUsageIsReported(const Config &config, bool fastSearch); template <typename AttributeType> @@ -2019,6 +2022,43 @@ AttributeTest::testCompactLidSpace() TEST_DO(testCompactLidSpace(Config(BasicType::PREDICATE, CollectionType::SINGLE))); } +namespace { + +uint32_t +get_default_value_ref_count(AttributeVector &attr) +{ + auto *enum_store_base = attr.getEnumStoreBase(); + auto &enum_store = dynamic_cast<EnumStoreT<int32_t> &>(*enum_store_base); + IAttributeVector::EnumHandle default_value_handle(0); + if (enum_store.find_enum(attr.getDefaultValue(), default_value_handle)) { + datastore::EntryRef default_value_ref(default_value_handle); + assert(default_value_ref.valid()); + return enum_store.get_ref_count(default_value_ref); + } else { + return 0u; + } +} + +} + + +void +AttributeTest::test_shrink_lid_space() +{ + Config cfg(BasicType::INT32, CollectionType::SINGLE); + cfg.setFastSearch(true); + vespalib::string name = "shrink"; + AttributePtr attr = AttributeFactory::createAttribute(name, cfg); + attr->addReservedDoc(); + attr->addDocs(10); + EXPECT_EQUAL(11u, get_default_value_ref_count(*attr)); + attr->compactLidSpace(6); + EXPECT_EQUAL(11u, get_default_value_ref_count(*attr)); + attr->shrinkLidSpace(); + EXPECT_EQUAL(6u, attr->getNumDocs()); + EXPECT_EQUAL(6u, get_default_value_ref_count(*attr)); +} + template <typename AttributeType> void AttributeTest::requireThatAddressSpaceUsageIsReported(const Config &config, bool fastSearch) @@ -2223,6 +2263,7 @@ int AttributeTest::Main() testCreateSerialNum(); testPredicateHeaderTags(); TEST_DO(testCompactLidSpace()); + TEST_DO(test_shrink_lid_space()); TEST_DO(requireThatAddressSpaceUsageIsReported()); testReaderDuringLastUpdate(); TEST_DO(testPendingCompaction()); diff --git a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp index 265116f3bd1..5ad1629e673 100644 --- a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp @@ -284,6 +284,17 @@ SingleValueEnumAttribute<B>::onShrinkLidSpace() if (pab != nullptr) { pab->clearPostings(e, committedDocIdLimit, _enumIndices.size()); } + uint32_t shrink_docs = _enumIndices.size() - committedDocIdLimit; + if (shrink_docs > 0u) { + datastore::EntryRef default_value_ref(e); + assert(default_value_ref.valid()); + uint32_t default_value_ref_count = this->_enumStore.get_ref_count(default_value_ref); + assert(default_value_ref_count >= shrink_docs); + this->_enumStore.set_ref_count(default_value_ref, default_value_ref_count - shrink_docs); + IEnumStore::IndexSet possibly_unused; + possibly_unused.insert(default_value_ref); + this->_enumStore.free_unused_values(possibly_unused); + } _enumIndices.shrink(committedDocIdLimit); this->setNumDocs(committedDocIdLimit); } |