diff options
-rw-r--r-- | searchlib/src/vespa/searchlib/memoryindex/field_inverter.cpp | 4 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/memoryindex/field_inverter.h | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_inverter.cpp b/searchlib/src/vespa/searchlib/memoryindex/field_inverter.cpp index cae4190b774..d96b8491027 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/field_inverter.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/field_inverter.cpp @@ -8,7 +8,6 @@ #include <vespa/document/annotation/spanlist.h> #include <vespa/document/annotation/spantree.h> #include <vespa/document/annotation/spantreevisitor.h> -#include <vespa/document/datatype/urldatatype.h> #include <vespa/document/fieldvalue/arrayfieldvalue.h> #include <vespa/document/fieldvalue/stringfieldvalue.h> #include <vespa/document/fieldvalue/weightedsetfieldvalue.h> @@ -16,9 +15,9 @@ #include <vespa/searchlib/bitcompression/posocccompression.h> #include <vespa/searchlib/common/sort.h> #include <vespa/searchlib/util/url.h> -#include <vespa/vespalib/text/lowercase.h> #include <vespa/vespalib/text/utf8.h> #include <vespa/vespalib/util/stringfmt.h> +#include <vespa/vespalib/stllike/hash_map.hpp> #include <stdexcept> #include <vespa/log/log.h> @@ -362,7 +361,6 @@ FieldInverter::FieldInverter(const Schema &schema, uint32_t fieldId, _elems(), _positions(), _features(), - _elementWordRefs(), _wordRefs(1), _terms(), _abortedDocs(), diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_inverter.h b/searchlib/src/vespa/searchlib/memoryindex/field_inverter.h index 8dd308f1a4d..56cb1677f67 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/field_inverter.h +++ b/searchlib/src/vespa/searchlib/memoryindex/field_inverter.h @@ -11,7 +11,6 @@ #include <vespa/searchlib/index/docidandfeatures.h> #include <vespa/vespalib/stllike/allocator.h> #include <limits> -#include <map> namespace search::index { class FieldLengthCalculator; } @@ -36,8 +35,7 @@ public: uint32_t _wordPos; uint32_t _elemRef; // Offset in _elems - static constexpr uint32_t _elemRemoved = - std::numeric_limits<uint32_t>::max(); + static constexpr uint32_t _elemRemoved = std::numeric_limits<uint32_t>::max(); PosInfo() noexcept : _wordNum(0), @@ -174,7 +172,6 @@ private: ElemInfoVec _elems; PosInfoVec _positions; index::DocIdAndPosOccFeatures _features; - UInt32Vector _elementWordRefs; UInt32Vector _wordRefs; using SpanTerm = std::pair<document::Span, const document::FieldValue *>; @@ -182,9 +179,9 @@ private: SpanTermVector _terms; // Info about aborted and pending documents. - std::vector<PositionRange> _abortedDocs; - std::map<uint32_t, PositionRange> _pendingDocs; - UInt32Vector _removeDocs; + std::vector<PositionRange> _abortedDocs; + vespalib::hash_map<uint32_t, PositionRange> _pendingDocs; + UInt32Vector _removeDocs; FieldIndexRemover &_remover; IOrderedFieldIndexInserter &_inserter; |