diff options
author | Henning Baldersheim <balder@oath.com> | 2018-09-04 15:29:02 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-09-04 15:29:02 +0200 |
commit | de1162c1b1be3d03a8b2417228f5b9aa37abd8cd (patch) | |
tree | dcd31033d50709c5f9864c6fcafc492256bbb829 /searchlib | |
parent | 3019e20cd73dc8234ed45063bf7c8fca15fa51d0 (diff) |
No need to take the guard to protect values only used here.
Diffstat (limited to 'searchlib')
-rw-r--r-- | searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp | 16 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp | 11 |
2 files changed, 5 insertions, 22 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp index 158343ef7c0..0fd40ab027b 100644 --- a/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp @@ -7,8 +7,6 @@ #include "multienumattributesaver.h" #include "load_utils.h" -#include <stdexcept> - namespace search { template <typename B, typename M> @@ -199,18 +197,10 @@ template <typename B, typename M> std::unique_ptr<AttributeSaver> MultiValueEnumAttribute<B, M>::onInitSave(vespalib::stringref fileName) { - { - this->logEnumStoreEvent("reenumerate", "drain"); - EnumModifier enumGuard(this->getEnumModifier()); - this->logEnumStoreEvent("reenumerate", "start"); - this->_enumStore.reEnumerate(); - } - this->logEnumStoreEvent("reenumerate", "complete"); - vespalib::GenerationHandler::Guard guard(this->getGenerationHandler(). - takeGuard()); + this->_enumStore.reEnumerate(); + vespalib::GenerationHandler::Guard guard(this->getGenerationHandler().takeGuard()); return std::make_unique<MultiValueEnumAttributeSaver<WeightedIndex>> - (std::move(guard), this->createAttributeHeader(fileName), this->_mvMapping, - this->_enumStore); + (std::move(guard), this->createAttributeHeader(fileName), this->_mvMapping, this->_enumStore); } } // namespace search diff --git a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp index c7299cd71d9..cc9b0346690 100644 --- a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp @@ -309,15 +309,8 @@ template <typename B> std::unique_ptr<AttributeSaver> SingleValueEnumAttribute<B>::onInitSave(vespalib::stringref fileName) { - { - this->logEnumStoreEvent("reenumerate", "drain"); - EnumModifier enumGuard(this->getEnumModifier()); - this->logEnumStoreEvent("reenumerate", "start"); - this->_enumStore.reEnumerate(); - } - this->logEnumStoreEvent("reenumerate", "complete"); - vespalib::GenerationHandler::Guard guard(this->getGenerationHandler(). - takeGuard()); + this->_enumStore.reEnumerate(); + vespalib::GenerationHandler::Guard guard(this->getGenerationHandler().takeGuard()); return std::make_unique<SingleValueEnumAttributeSaver> (std::move(guard), this->createAttributeHeader(fileName), |