diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-09-13 16:35:41 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-09-14 19:37:41 +0000 |
commit | 2e4d9c8f4e53032d8ed4483ccb1f703f45ce016c (patch) | |
tree | f4bb45340d75468b796d387875f7948ae5cd3122 /searchlib | |
parent | 3a539203f2cd93d248f46ec4e75922879699e55b (diff) |
Be explicit about using setEnum(bool hasEnum)
Diffstat (limited to 'searchlib')
4 files changed, 6 insertions, 24 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp index 3d5f2ec09fd..ccd6f144f9b 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp +++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp @@ -422,17 +422,6 @@ AttributeVector::divideByZeroWarning() { "or weighted sets. Ignoring operation."); } - -void -AttributeVector::performCompactionWarning() -{ - LOG(warning, - "Could not perform compaction on MultiValueMapping " - "with current generation = %" PRIu64, - _genHandler.getCurrentGeneration()); -} - - void AttributeVector::addReservedDoc() { diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h index 68dfe52643f..2787c929f14 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributevector.h +++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h @@ -120,15 +120,8 @@ protected: */ void updateStat(bool forceUpdate); - void - updateStatistics(uint64_t numValues, - uint64_t numUniqueValue, - uint64_t allocated, - uint64_t used, - uint64_t dead, - uint64_t onHold); - - void performCompactionWarning(); + void updateStatistics(uint64_t numValues, uint64_t numUniqueValue, uint64_t allocated, + uint64_t used, uint64_t dead, uint64_t onHold); AttributeVector(vespalib::stringref baseFileName, const Config & c); @@ -138,8 +131,7 @@ protected: } } - void setEnumMax(uint32_t e) { _enumMax = e; setEnum(); } - void setEnum(bool hasEnum_=true) { _hasEnum = hasEnum_; } + void setEnum(bool hasEnum_) { _hasEnum = hasEnum_; } void setNumDocs(uint32_t n) { _status.setNumDocs(n); } void incNumDocs() { _status.incNumDocs(); } diff --git a/searchlib/src/vespa/searchlib/attribute/attrvector.hpp b/searchlib/src/vespa/searchlib/attribute/attrvector.hpp index aee6180fcee..fdc94df2e40 100644 --- a/searchlib/src/vespa/searchlib/attribute/attrvector.hpp +++ b/searchlib/src/vespa/searchlib/attribute/attrvector.hpp @@ -132,7 +132,7 @@ StringDirectAttrVector(const vespalib::string & baseFileName, const Config & c) if (F::IsMultiValue()) { _idx.push_back(0); } - setEnum(); + setEnum(true); } template <typename F> @@ -143,7 +143,7 @@ StringDirectAttrVector(const vespalib::string & baseFileName) : if (F::IsMultiValue()) { _idx.push_back(0); } - setEnum(); + setEnum(true); } template <typename F> diff --git a/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp b/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp index 9343dafe917..e84f7f72aeb 100644 --- a/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp +++ b/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp @@ -52,6 +52,7 @@ ReferenceAttribute::ReferenceAttribute(const vespalib::stringref baseFileName, c _gidToLidMapperFactory(), _referenceMappings(getGenerationHolder(), getCommittedDocIdLimitRef(), get_initial_alloc()) { + //TODO this is not safe without implementing getEnum setEnum(true); } |