diff options
author | Geir Storli <geirst@yahooinc.com> | 2023-07-06 15:50:22 +0000 |
---|---|---|
committer | Geir Storli <geirst@yahooinc.com> | 2023-07-06 15:50:22 +0000 |
commit | bfd1eeb45092831858afa7bb9c638b66d6569700 (patch) | |
tree | 1a8481de5be8f7ccd5e94a5f12678f546e2f5283 /streamingvisitors/src | |
parent | c09d214ecead2941928e8591674da87e387c3f3d (diff) |
Modernize C++ code with auto and range-based loops.
Diffstat (limited to 'streamingvisitors/src')
9 files changed, 32 insertions, 37 deletions
diff --git a/streamingvisitors/src/vespa/searchvisitor/rankmanager.h b/streamingvisitors/src/vespa/searchvisitor/rankmanager.h index 71910c65242..54414f80512 100644 --- a/streamingvisitors/src/vespa/searchvisitor/rankmanager.h +++ b/streamingvisitors/src/vespa/searchvisitor/rankmanager.h @@ -44,7 +44,7 @@ public: bool initRankSetup(const search::fef::BlueprintFactory & factory); bool setup(const RankManager & manager); int getIndex(const vespalib::string & key) const { - Map::const_iterator found(_rpmap.find(key)); + auto found = _rpmap.find(key); return (found != _rpmap.end()) ? found->second : 0; } @@ -60,7 +60,7 @@ public: return _indexEnv[getIndex(rankProfile)]; } const View *getView(const vespalib::string & index) const { - ViewMap::const_iterator itr = _views.find(index); + auto itr = _views.find(index); if (itr != _views.end()) { return &itr->second; } diff --git a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp index 92e1ff0e460..78d72102fe9 100644 --- a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp @@ -81,10 +81,8 @@ RankProcessor::initQueryEnvironment() vespalib::string expandedIndexName = vsm::FieldSearchSpecMap::stripNonFields(term.getTerm()->index()); const RankManager::View *view = _rankManagerSnapshot->getView(expandedIndexName); if (view != nullptr) { - RankManager::View::const_iterator iter = view->begin(); - RankManager::View::const_iterator endp = view->end(); - for (; iter != endp; ++iter) { - qtd.getTermData().addField(*iter).setHandle(_mdLayout.allocTermField(*iter)); + for (auto field_id : *view) { + qtd.getTermData().addField(field_id).setHandle(_mdLayout.allocTermField(field_id)); } } else { LOG(warning, "Could not find a view for index '%s'. Ranking no fields.", diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp index 75e07615bd9..2119364c2bc 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp @@ -131,10 +131,10 @@ SearchEnvironment::getEnv(const vespalib::string & searchCluster) std::lock_guard guard(_lock); _threadLocals.emplace_back(std::move(envMap)); } - EnvMap::iterator localFound = _localEnvMap->find(searchCluster); + auto localFound = _localEnvMap->find(searchCluster); if (localFound == _localEnvMap->end()) { std::lock_guard guard(_lock); - EnvMap::iterator found = _envMap.find(searchCluster); + auto found = _envMap.find(searchCluster); if (found == _envMap.end()) { LOG(debug, "Init VSMAdapter with config id = '%s'", searchCluster.c_str()); Env::SP env = std::make_shared<Env>(searchClusterUri, _wordFolder, _transport, _file_distributor_connection_spec); diff --git a/streamingvisitors/src/vespa/vsm/common/document.cpp b/streamingvisitors/src/vespa/vsm/common/document.cpp index a345c82ce2d..167a54a75ea 100644 --- a/streamingvisitors/src/vespa/vsm/common/document.cpp +++ b/streamingvisitors/src/vespa/vsm/common/document.cpp @@ -23,8 +23,8 @@ vespalib::asciistream & operator << (vespalib::asciistream & os, const FieldRef vespalib::asciistream & operator << (vespalib::asciistream & os, const StringFieldIdTMap & f) { - for (StringFieldIdTMapT::const_iterator it=f._map.begin(), mt=f._map.end(); it != mt; it++) { - os << it->first << " = " << it->second << '\n'; + for (const auto& elem : f._map) { + os << elem.first << " = " << elem.second << '\n'; } return os; } @@ -49,7 +49,7 @@ void StringFieldIdTMap::add(const vespalib::string & s) FieldIdT StringFieldIdTMap::fieldNo(const vespalib::string & fName) const { - StringFieldIdTMapT::const_iterator found = _map.find(fName); + auto found = _map.find(fName); FieldIdT fNo((found != _map.end()) ? found->second : npos); return fNo; } diff --git a/streamingvisitors/src/vespa/vsm/common/documenttypemapping.cpp b/streamingvisitors/src/vespa/vsm/common/documenttypemapping.cpp index 7886c44b2e0..71b48495f5e 100644 --- a/streamingvisitors/src/vespa/vsm/common/documenttypemapping.cpp +++ b/streamingvisitors/src/vespa/vsm/common/documenttypemapping.cpp @@ -43,7 +43,7 @@ void DocumentTypeMapping::init(const vespalib::string & defaultDocumentType, bool DocumentTypeMapping::prepareBaseDoc(SharedFieldPathMap & map) const { - FieldPathMapMapT::const_iterator found = _fieldMap.find(_defaultDocumentTypeName); + auto found = _fieldMap.find(_defaultDocumentTypeName); if (found != _fieldMap.end()) { map = std::make_shared<FieldPathMapT>(found->second); LOG(debug, "Found FieldPathMap for default document type '%s' with %zd elements", @@ -64,8 +64,8 @@ void DocumentTypeMapping::buildFieldMap( docTypePtr->getName().c_str(), fieldList.size(), typeId.c_str()); const document::DocumentType & docType = *docTypePtr; size_t highestFNo(0); - for (StringFieldIdTMapT::const_iterator it = fieldList.begin(), mt = fieldList.end(); it != mt; it++) { - highestFNo = std::max(highestFNo, size_t(it->second)); + for (const auto& elem : fieldList) { + highestFNo = std::max(highestFNo, size_t(elem.second)); } highestFNo++; FieldPathMapT & fieldMap = _fieldMap[typeId]; @@ -73,20 +73,20 @@ void DocumentTypeMapping::buildFieldMap( fieldMap.resize(highestFNo); size_t validCount(0); - for (StringFieldIdTMapT::const_iterator it = fieldList.begin(), mt = fieldList.end(); it != mt; it++) { - vespalib::string fname = it->first; - LOG(debug, "Handling %s -> %d", fname.c_str(), it->second); + for (const auto& elem : fieldList) { + vespalib::string fname = elem.first; + LOG(debug, "Handling %s -> %d", fname.c_str(), elem.second); try { - if ((it->first[0] != '[') && (it->first != "summaryfeatures") && (it->first != "rankfeatures") && (it->first != "ranklog") && (it->first != "sddocname") && (it->first != "documentid")) { + if ((elem.first[0] != '[') && (elem.first != "summaryfeatures") && (elem.first != "rankfeatures") && (elem.first != "ranklog") && (elem.first != "sddocname") && (elem.first != "documentid")) { FieldPath fieldPath; docType.buildFieldPath(fieldPath, fname); - fieldMap[it->second] = std::move(fieldPath); + fieldMap[elem.second] = std::move(fieldPath); validCount++; - LOG(spam, "Found %s -> %d in document", fname.c_str(), it->second); + LOG(spam, "Found %s -> %d in document", fname.c_str(), elem.second); } } catch (const std::exception & e) { LOG(debug, "Could not get field info for '%s' in documenttype '%s' (id = '%s') : %s", - it->first.c_str(), docType.getName().c_str(), typeId.c_str(), e.what()); + elem.first.c_str(), docType.getName().c_str(), typeId.c_str(), e.what()); } } _documentTypeFreq.insert(std::make_pair(validCount, docTypePtr)); diff --git a/streamingvisitors/src/vespa/vsm/common/fieldmodifier.cpp b/streamingvisitors/src/vespa/vsm/common/fieldmodifier.cpp index b39afd83b5a..93a071deade 100644 --- a/streamingvisitors/src/vespa/vsm/common/fieldmodifier.cpp +++ b/streamingvisitors/src/vespa/vsm/common/fieldmodifier.cpp @@ -14,9 +14,9 @@ FieldModifierMap::~FieldModifierMap() { } FieldModifier * FieldModifierMap::getModifier(FieldIdT fId) const { - FieldModifierMapT::const_iterator itr = _map.find(fId); + auto itr = _map.find(fId); if (itr == _map.end()) { - return NULL; + return nullptr; } return itr->second.get(); } diff --git a/streamingvisitors/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp index 3495d46b85b..ee1b3f79aed 100644 --- a/streamingvisitors/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp +++ b/streamingvisitors/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp @@ -32,12 +32,11 @@ UTF8SuffixStringFieldSearcher::matchTerms(const FieldRef & f, const size_t mints ++srcbuf; } srcbuf = tokenize(srcbuf, _buf->capacity(), dstbuf, tokenlen); - for (QueryTermList::iterator it = _qtl.begin(), mt = _qtl.end(); it != mt; ++it) { - QueryTerm & qt = **it; + for (auto qt : _qtl) { const cmptype_t * term; - termsize_t tsz = qt.term(term); + termsize_t tsz = qt->term(term); if (matchTermSuffix(term, tsz, dstbuf, tokenlen)) { - addHit(qt, words); + addHit(*qt, words); } } words++; diff --git a/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.cpp b/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.cpp index f6ac3a6c88a..5f0be889621 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.cpp +++ b/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.cpp @@ -193,7 +193,7 @@ bool FieldSearchSpecMap::buildFieldsInQuery(const Query & query, StringFieldIdTM const IndexFieldMapT & fim = dtm.second; vespalib::string rawIndex(term->index()); vespalib::string index(stripNonFields(rawIndex)); - IndexFieldMapT::const_iterator fIt = fim.find(index); + auto fIt = fim.find(index); if (fIt != fim.end()) { for(FieldIdT fid : fIt->second) { const FieldSearchSpec & spec = specMap().find(fid)->second; @@ -286,7 +286,7 @@ FieldSearchSpecMap::reconfigFromQuery(const Query & query) for (const auto & termA : qtl) { for (const auto & ifm : documentTypeMap()) { - IndexFieldMapT::const_iterator itc = ifm.second.find(termA->index()); + auto itc = ifm.second.find(termA->index()); if (itc != ifm.second.end()) { for (FieldIdT fid : itc->second) { FieldSearchSpec & spec = _specMap.find(fid)->second; diff --git a/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.cpp b/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.cpp index 2d2d3f24bc6..5d29ca993f2 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.cpp +++ b/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.cpp @@ -18,7 +18,7 @@ namespace { void addIfNotPresent(FieldQueryTermMap & map, vsm::FieldIdT fId, QueryTerm * qt) { - FieldQueryTermMap::iterator itr = map.find(fId); + auto itr = map.find(fId); if (itr != map.end()) { QueryTermList & qtl = itr->second; if (std::find(qtl.begin(), qtl.end(), qt) == qtl.end()) { @@ -108,16 +108,14 @@ SnippetModifierManager::setup(const QueryTermList& queryTerms, FieldQueryTermMap fqtm; // setup modifiers - for (QueryTermList::const_iterator i = queryTerms.begin(); i != queryTerms.end(); ++i) { - QueryTerm * qt = *i; - IndexFieldMapT::const_iterator j = indexMap.find(qt->index()); - if (j != indexMap.end()) { - for (FieldIdTList::const_iterator k = j->second.begin(); k != j->second.end(); ++k) { - FieldIdT fId = *k; + for (auto qt : queryTerms) { + auto itr = indexMap.find(qt->index()); + if (itr != indexMap.end()) { + for (auto fId : itr->second) { const FieldSearchSpec & spec = specMap.find(fId)->second; if (spec.searcher().substring() || qt->isSubstring()) { // we need a modifier for this field id addIfNotPresent(fqtm, fId, qt); - if (_modifiers.getModifier(fId) == NULL) { + if (_modifiers.getModifier(fId) == nullptr) { LOG(debug, "Create snippet modifier for field id '%u'", fId); UTF8SubstringSnippetModifier::SP searcher (new UTF8SubstringSnippetModifier(fId, _searchModifyBuf, _searchOffsetBuf)); |