diff options
author | Tor Egge <Tor.Egge@yahooinc.com> | 2022-04-06 16:54:11 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@yahooinc.com> | 2022-04-06 16:54:11 +0200 |
commit | 730fddd9578d3fc1a623fa618763b091b98551c2 (patch) | |
tree | eea82f31230a4667e8d4d12e49c062d229278c55 | |
parent | bd880deb08ddca54e5fce63763e86af59bfbce88 (diff) |
Fix typos in class comments. Rename get_read_view() to make_read_view().
9 files changed, 12 insertions, 12 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp b/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp index bd77ce0044d..ed72e54946e 100644 --- a/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp +++ b/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp @@ -56,7 +56,7 @@ template <typename B> std::unique_ptr<attribute::SearchContext> FlagAttributeT<B>::getSearch(QueryTermSimple::UP qTerm, const attribute::SearchContextParams &) const { - return std::make_unique<SearchContext>(std::move(qTerm), *this, this->_mvMapping.get_read_view(this->getCommittedDocIdLimit())); + return std::make_unique<SearchContext>(std::move(qTerm), *this, this->_mvMapping.make_read_view(this->getCommittedDocIdLimit())); } template <typename B> diff --git a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.h b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.h index 16184fbe5fb..b57269d04c6 100644 --- a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.h +++ b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.h @@ -10,7 +10,7 @@ namespace search::attribute { /** - * Class for mapping from from document id to an array of values. + * Class for mapping from document id to an array of values. */ template <typename EntryT, typename RefT = vespalib::datastore::EntryRefT<19> > class MultiValueMapping : public MultiValueMappingBase @@ -42,11 +42,11 @@ public: ArrayRef get_writable(uint32_t docId) { return _store.get_writable(_indices[docId].load_relaxed()); } /* - * Readers holding a generation guard can call get_read_view() to + * Readers holding a generation guard can call make_read_view() to * get a read view to the multi value mapping. Array bound (read_size) must * be specified by reader, cf. committed docid limit in attribute vectors. */ - ReadView get_read_view(size_t read_size) const { return ReadView(_indices.get_read_view(read_size), &_store); } + ReadView make_read_view(size_t read_size) const { return ReadView(_indices.make_read_view(read_size), &_store); } // Pass on hold list management to underlying store void transferHoldLists(generation_t generation) { _store.transferHoldLists(generation); } void trimHoldLists(generation_t firstUsed) { _store.trimHoldLists(firstUsed); } diff --git a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping_read_view.h b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping_read_view.h index 502cc353ab9..116e069e8b4 100644 --- a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping_read_view.h +++ b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping_read_view.h @@ -9,7 +9,7 @@ namespace search::attribute { /** - * Class for mapping from from document id to an array of values as reader. + * Class for mapping from document id to an array of values as reader. */ template <typename EntryT, typename RefT = vespalib::datastore::EntryRefT<19> > class MultiValueMappingReadView diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp index d31f3ddd450..99963094366 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp @@ -171,7 +171,7 @@ MultiValueNumericAttribute<B, M>::getSearch(QueryTermSimple::UP qTerm, const attribute::SearchContextParams & params) const { (void) params; - return std::make_unique<attribute::MultiNumericSearchContext<T, M>>(std::move(qTerm), *this, this->_mvMapping.get_read_view(this->getCommittedDocIdLimit())); + return std::make_unique<attribute::MultiNumericSearchContext<T, M>>(std::move(qTerm), *this, this->_mvMapping.make_read_view(this->getCommittedDocIdLimit())); } diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp index 052322fd0e2..c35a2e55ec3 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp @@ -122,7 +122,7 @@ MultiValueNumericEnumAttribute<B, M>::getSearch(QueryTermSimple::UP qTerm, { (void) params; auto doc_id_limit = this->getCommittedDocIdLimit(); - return std::make_unique<attribute::MultiNumericEnumSearchContext<T, M>>(std::move(qTerm), *this, this->_mvMapping.get_read_view(doc_id_limit), this->_enumStore); + return std::make_unique<attribute::MultiNumericEnumSearchContext<T, M>>(std::move(qTerm), *this, this->_mvMapping.make_read_view(doc_id_limit), this->_enumStore); } } // namespace search diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp index 97912614551..4854728ca37 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp @@ -79,7 +79,7 @@ MultiValueNumericPostingAttribute<B, M>::getSearch(QueryTermSimpleUP qTerm, using BaseSC = attribute::MultiNumericEnumSearchContext<typename B::BaseClass::BaseType, M>; using SC = attribute::NumericPostingSearchContext<BaseSC, SelfType, int32_t>; auto doc_id_limit = this->getCommittedDocIdLimit(); - BaseSC base_sc(std::move(qTerm), *this, this->_mvMapping.get_read_view(doc_id_limit), this->_enumStore); + BaseSC base_sc(std::move(qTerm), *this, this->_mvMapping.make_read_view(doc_id_limit), this->_enumStore); return std::make_unique<SC>(std::move(base_sc), params, *this); } diff --git a/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp index e83d6baa9ab..2d60887c23b 100644 --- a/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp @@ -44,7 +44,7 @@ MultiValueStringAttributeT<B, M>::getSearch(QueryTermSimpleUP qTerm, { bool cased = this->get_match_is_cased(); auto doc_id_limit = this->getCommittedDocIdLimit(); - return std::make_unique<attribute::MultiStringEnumHintSearchContext<M>>(std::move(qTerm), cased, *this, this->_mvMapping.get_read_view(doc_id_limit), this->_enumStore, doc_id_limit, this->getStatus().getNumValues()); + return std::make_unique<attribute::MultiStringEnumHintSearchContext<M>>(std::move(qTerm), cased, *this, this->_mvMapping.make_read_view(doc_id_limit), this->_enumStore, doc_id_limit, this->getStatus().getNumValues()); } } // namespace search diff --git a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp index 132f57e9c95..d3cd338cacb 100644 --- a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp @@ -94,7 +94,7 @@ MultiValueStringPostingAttributeT<B, T>::getSearch(QueryTermSimpleUP qTerm, using SC = attribute::StringPostingSearchContext<BaseSC, SelfType, int32_t>; bool cased = this->get_match_is_cased(); auto doc_id_limit = this->getCommittedDocIdLimit(); - BaseSC base_sc(std::move(qTerm), cased, *this, this->_mvMapping.get_read_view(doc_id_limit), this->_enumStore); + BaseSC base_sc(std::move(qTerm), cased, *this, this->_mvMapping.make_read_view(doc_id_limit), this->_enumStore); return std::make_unique<SC>(std::move(base_sc), params.useBitVector(), *this); } diff --git a/vespalib/src/vespa/vespalib/util/rcuvector.h b/vespalib/src/vespa/vespalib/util/rcuvector.h index e3e17d8edf0..ce48082099c 100644 --- a/vespalib/src/vespa/vespalib/util/rcuvector.h +++ b/vespalib/src/vespa/vespalib/util/rcuvector.h @@ -150,11 +150,11 @@ public: const T& get_elem_ref(size_t i) const noexcept { return _data[i]; } // Called from writer only /* - * Readers holding a generation guard can call get_read_view() to + * Readers holding a generation guard can call make_read_view() to * get a read view to the rcu vector. Array bound (read_size) must * be specified by reader, cf. committed docid limit in attribute vectors. */ - ConstArrayRef<T> get_read_view(size_t read_size) const noexcept { + ConstArrayRef<T> make_read_view(size_t read_size) const noexcept { return ConstArrayRef<T>(&acquire_elem_ref(0), read_size); } |