diff options
author | Tor Egge <Tor.Egge@online.no> | 2024-02-12 23:58:33 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2024-02-12 23:58:33 +0100 |
commit | 9b6247fad7cf92b4761e1b3f1fba264236ea78c7 (patch) | |
tree | 1b7eb33c0bb9741e5ae30be4349061776dc0ee4b | |
parent | afac26a86a016bff4d5b031b00ebf33a3d858c43 (diff) |
Remove dead code from search::predicate::DocumentFeaturesStore.
3 files changed, 1 insertions, 31 deletions
diff --git a/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp b/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp index a3f10f14d54..1f580d707e8 100644 --- a/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp +++ b/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp @@ -16,19 +16,11 @@ using std::vector; namespace search::predicate { -void -DocumentFeaturesStore::setCurrent(uint32_t docId, FeatureVector *features) { - _currDocId = docId; - _currFeatures = features; -} - DocumentFeaturesStore::DocumentFeaturesStore(uint32_t arity) : _docs(), _ranges(), _word_store(), _word_index(), - _currDocId(0), - _currFeatures(), _numFeatures(0), _numRanges(0), _arity(arity) { @@ -108,20 +100,6 @@ DocumentFeaturesStore::~DocumentFeaturesStore() { } void -DocumentFeaturesStore::insert(uint64_t featureId, uint32_t docId) { - assert(docId != 0); - if (_currDocId != docId) { - auto docsItr = _docs.find(docId); - if (docsItr == _docs.end()) { - docsItr = _docs.insert(std::make_pair(docId, FeatureVector())).first; - } - setCurrent(docId, &docsItr->second); - } - _currFeatures->push_back(featureId); - ++_numFeatures; -} - -void DocumentFeaturesStore::insert(const PredicateTreeAnnotations &annotations, uint32_t doc_id) { assert(doc_id != 0); if (!annotations.features.empty()) { @@ -189,9 +167,6 @@ DocumentFeaturesStore::remove(uint32_t doc_id) { (_numRanges - range_itr->second.size()) : 0; _ranges.erase(range_itr); } - if (_currDocId == doc_id) { - setCurrent(0, nullptr); - } } vespalib::MemoryUsage diff --git a/searchlib/src/vespa/searchlib/predicate/document_features_store.h b/searchlib/src/vespa/searchlib/predicate/document_features_store.h index 9225076000f..3b8aed53ca1 100644 --- a/searchlib/src/vespa/searchlib/predicate/document_features_store.h +++ b/searchlib/src/vespa/searchlib/predicate/document_features_store.h @@ -57,14 +57,10 @@ class DocumentFeaturesStore { RangeFeaturesMap _ranges; WordStore _word_store; WordIndex _word_index; - uint32_t _currDocId; - FeatureVector *_currFeatures; size_t _numFeatures; size_t _numRanges; uint32_t _arity; - void setCurrent(uint32_t docId, FeatureVector *features); - public: using FeatureSet = std::unordered_set<uint64_t>; @@ -72,7 +68,6 @@ public: DocumentFeaturesStore(vespalib::DataBuffer &buffer); ~DocumentFeaturesStore(); - void insert(uint64_t featureId, uint32_t docId); void insert(const PredicateTreeAnnotations &annotations, uint32_t docId); FeatureSet get(uint32_t docId) const; void remove(uint32_t docId); diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.h b/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.h index 3e8f9c98f22..389c346a61b 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.h +++ b/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.h @@ -22,7 +22,7 @@ constexpr uint32_t MIN_INTERVAL = 0x0001; constexpr uint32_t MAX_INTERVAL = 0xffff; struct PredicateTreeAnnotations { - PredicateTreeAnnotations(uint32_t mf=0, uint16_t ir=MAX_INTERVAL); + explicit PredicateTreeAnnotations(uint32_t mf=0, uint16_t ir=MAX_INTERVAL); ~PredicateTreeAnnotations(); uint32_t min_feature; uint16_t interval_range; |