diff options
14 files changed, 41 insertions, 41 deletions
diff --git a/searchcommon/src/vespa/searchcommon/attribute/i_search_context.h b/searchcommon/src/vespa/searchcommon/attribute/i_search_context.h index 151e24b5b64..d18c4840009 100644 --- a/searchcommon/src/vespa/searchcommon/attribute/i_search_context.h +++ b/searchcommon/src/vespa/searchcommon/attribute/i_search_context.h @@ -18,8 +18,8 @@ public: using DocId = uint32_t; private: - virtual int32_t onCmp(DocId docId, int32_t elementId, int32_t &weight) const = 0; - virtual int32_t onCmp(DocId docId, int32_t elementId) const = 0; + virtual int32_t onFind(DocId docId, int32_t elementId, int32_t &weight) const = 0; + virtual int32_t onFind(DocId docId, int32_t elementId) const = 0; public: virtual ~ISearchContext() {} @@ -51,8 +51,8 @@ public: virtual const QueryTermBase &queryTerm() const = 0; virtual const vespalib::string &attributeName() const = 0; - int32_t find(DocId docId, int32_t elementId, int32_t &weight) const { return onCmp(docId, elementId, weight); } - int32_t find(DocId docId, int32_t elementId) const { return onCmp(docId, elementId); } + int32_t find(DocId docId, int32_t elementId, int32_t &weight) const { return onFind(docId, elementId, weight); } + int32_t find(DocId docId, int32_t elementId) const { return onFind(docId, elementId); } bool matches(DocId docId, int32_t &weight) const { weight = 0; int32_t oneWeight(0); diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.cpp index 99865f6bd44..e10e6ed539b 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.cpp +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.cpp @@ -98,13 +98,13 @@ public: } int32_t -SearchContext::onCmp(DocId, int32_t, int32_t &) const +SearchContext::onFind(DocId, int32_t, int32_t &) const { throw vespalib::IllegalStateException("The function is not implemented for documentmetastore::SearchContext"); } int32_t -SearchContext::onCmp(DocId, int32_t ) const +SearchContext::onFind(DocId, int32_t ) const { throw vespalib::IllegalStateException("The function is not implemented for documentmetastore::SearchContext"); } diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.h index 6e1eaa468c9..31c520bedf5 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.h +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.h @@ -20,8 +20,8 @@ private: document::GlobalId _gid; unsigned int approximateHits() const override; - int32_t onCmp(DocId docId, int32_t elemId, int32_t &weight) const override; - int32_t onCmp(DocId docId, int32_t elemId) const override; + int32_t onFind(DocId docId, int32_t elemId, int32_t &weight) const override; + int32_t onFind(DocId docId, int32_t elemId) const override; search::queryeval::SearchIterator::UP createIterator(search::fef::TermFieldMatchData *matchData, bool strict) override; diff --git a/searchlib/src/vespa/searchlib/attribute/imported_search_context.h b/searchlib/src/vespa/searchlib/attribute/imported_search_context.h index 9573139b91a..cfb5371dbb9 100644 --- a/searchlib/src/vespa/searchlib/attribute/imported_search_context.h +++ b/searchlib/src/vespa/searchlib/attribute/imported_search_context.h @@ -72,8 +72,8 @@ public: return _target_search_context->find(getTargetLid(docId), elemId); } - int32_t onCmp(uint32_t docId, int32_t elemId, int32_t &weight) const override { return find(docId, elemId, weight); } - int32_t onCmp(uint32_t docId, int32_t elemId) const override { return find(docId, elemId); } + int32_t onFind(uint32_t docId, int32_t elemId, int32_t &weight) const override { return find(docId, elemId, weight); } + int32_t onFind(uint32_t docId, int32_t elemId) const override { return find(docId, elemId); } const ReferenceAttribute& attribute() const noexcept { return _reference_attribute; } diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h index dec8ca43143..9d0cac64adf 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h @@ -71,11 +71,11 @@ public: private: const MultiValueNumericAttribute<B, M> & _toBeSearched; - int32_t onCmp(DocId docId, int32_t elemId, int32_t & weight) const override { + int32_t onFind(DocId docId, int32_t elemId, int32_t & weight) const override { return find(docId, elemId, weight); } - int32_t onCmp(DocId docId, int32_t elemId) const override { + int32_t onFind(DocId docId, int32_t elemId) const override { return find(docId, elemId); } @@ -119,11 +119,11 @@ public: private: const MultiValueNumericAttribute<B, M> & _toBeSearched; - int32_t onCmp(DocId docId, int32_t elemId, int32_t & weight) const override { + int32_t onFind(DocId docId, int32_t elemId, int32_t & weight) const override { return find(docId, elemId, weight); } - int32_t onCmp(DocId docId, int32_t elemId) const override { + int32_t onFind(DocId docId, int32_t elemId) const override { return find(docId, elemId); } diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.h b/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.h index 3a7b20c686b..b25438f8f2a 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.h @@ -52,11 +52,11 @@ protected: protected: const MultiValueNumericEnumAttribute<B, M> & _toBeSearched; - int32_t onCmp(DocId docId, int32_t elemId, int32_t & weight) const override { + int32_t onFind(DocId docId, int32_t elemId, int32_t & weight) const override { return find(docId, elemId, weight); } - int32_t onCmp(DocId docId, int32_t elemId) const override { + int32_t onFind(DocId docId, int32_t elemId) const override { return find(docId, elemId); } @@ -105,11 +105,11 @@ protected: protected: const MultiValueNumericEnumAttribute<B, M> & _toBeSearched; - int32_t onCmp(DocId docId, int32_t elemId, int32_t & weight) const override { + int32_t onFind(DocId docId, int32_t elemId, int32_t & weight) const override { return find(docId, elemId, weight); } - int32_t onCmp(DocId docId, int32_t elemId) const override { + int32_t onFind(DocId docId, int32_t elemId) const override { return find(docId, elemId); } diff --git a/searchlib/src/vespa/searchlib/attribute/multistringattribute.h b/searchlib/src/vespa/searchlib/attribute/multistringattribute.h index a03a2a02287..2b936c6901e 100644 --- a/searchlib/src/vespa/searchlib/attribute/multistringattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/multistringattribute.h @@ -119,7 +119,7 @@ public: const MultiValueStringAttributeT<B, M> & myAttribute() const { return static_cast< const MultiValueStringAttributeT<B, M> & > (attribute()); } - int32_t onCmp(DocId docId, int32_t elemId) const override; + int32_t onFind(DocId docId, int32_t elemId) const override; template <typename Collector> int32_t collectWeight(DocId doc, int32_t elemId, int32_t & weight, Collector & collector) const; @@ -134,7 +134,7 @@ public: StringImplSearchContext(std::move(qTerm), toBeSearched) { } protected: - int32_t onCmp(DocId docId, int32_t elemId, int32_t & weight) const override; + int32_t onFind(DocId docId, int32_t elemId, int32_t &weight) const override; }; /* @@ -146,7 +146,7 @@ public: StringImplSearchContext(std::move(qTerm), toBeSearched) { } protected: - int32_t onCmp(DocId docId, int32_t elemId, int32_t & weight) const override; + int32_t onFind(DocId docId, int32_t elemId, int32_t &weight) const override; }; template <typename BT> diff --git a/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp index 20b9d2ed60b..209f6cf04df 100644 --- a/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp @@ -63,7 +63,7 @@ private: template <typename B, typename M> int32_t -MultiValueStringAttributeT<B, M>::StringSetImplSearchContext::onCmp(DocId doc, int32_t elemId, int32_t & weight) const +MultiValueStringAttributeT<B, M>::StringSetImplSearchContext::onFind(DocId doc, int32_t elemId, int32_t &weight) const { StringAttribute::StringSearchContext::CollectWeight collector; return this->collectWeight(doc, elemId, weight, collector); @@ -71,7 +71,7 @@ MultiValueStringAttributeT<B, M>::StringSetImplSearchContext::onCmp(DocId doc, i template <typename B, typename M> int32_t -MultiValueStringAttributeT<B, M>::StringArrayImplSearchContext::onCmp(DocId doc, int32_t elemId, int32_t & weight) const +MultiValueStringAttributeT<B, M>::StringArrayImplSearchContext::onFind(DocId doc, int32_t elemId, int32_t &weight) const { StringAttribute::StringSearchContext::CollectHitCount collector; return this->collectWeight(doc, elemId, weight, collector); @@ -92,7 +92,7 @@ MultiValueStringAttributeT<B, M>::StringImplSearchContext::collectWeight(DocId d template <typename B, typename M> int32_t -MultiValueStringAttributeT<B, M>::StringImplSearchContext::onCmp(DocId doc, int32_t elemId) const +MultiValueStringAttributeT<B, M>::StringImplSearchContext::onFind(DocId doc, int32_t elemId) const { const MultiValueStringAttributeT<B, M> & attr(static_cast< const MultiValueStringAttributeT<B, M> & > (attribute())); WeightedIndexArrayRef indices(attr._mvMapping.get(doc)); diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h b/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h index de149564f21..5bdcc3dfe63 100644 --- a/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h @@ -41,11 +41,11 @@ private: private: const T * _data; - int32_t onCmp(DocId docId, int32_t elemId, int32_t & weight) const override { + int32_t onFind(DocId docId, int32_t elemId, int32_t & weight) const override { return find(docId, elemId, weight); } - int32_t onCmp(DocId docId, int elemId) const override { + int32_t onFind(DocId docId, int elemId) const override { return find(docId, elemId); } diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericenumattribute.h b/searchlib/src/vespa/searchlib/attribute/singlenumericenumattribute.h index f10a6f0f35a..096c159115e 100644 --- a/searchlib/src/vespa/searchlib/attribute/singlenumericenumattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/singlenumericenumattribute.h @@ -58,11 +58,11 @@ protected: protected: const SingleValueNumericEnumAttribute<B> & _toBeSearched; - int32_t onCmp(DocId docId, int32_t elemId, int32_t & weight) const override { + int32_t onFind(DocId docId, int32_t elemId, int32_t & weight) const override { return find(docId, elemId, weight); } - int32_t onCmp(DocId docId, int32_t elemId) const override { + int32_t onFind(DocId docId, int32_t elemId) const override { return find(docId, elemId); } bool valid() const override; diff --git a/searchlib/src/vespa/searchlib/attribute/singlesmallnumericattribute.h b/searchlib/src/vespa/searchlib/attribute/singlesmallnumericattribute.h index 2087f74d104..f5f666bd89f 100644 --- a/searchlib/src/vespa/searchlib/attribute/singlesmallnumericattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/singlesmallnumericattribute.h @@ -67,12 +67,12 @@ public: uint32_t _valueShiftMask; uint32_t _wordShift; - int32_t onCmp(DocId docId, int32_t elementId, int32_t & weight) const override { - return cmp(docId, elementId, weight); + int32_t onFind(DocId docId, int32_t elementId, int32_t & weight) const override { + return find(docId, elementId, weight); } - int32_t onCmp(DocId docId, int32_t elementId) const override { - return cmp(docId, elementId); + int32_t onFind(DocId docId, int32_t elementId) const override { + return find(docId, elementId); } bool valid() const override; @@ -80,7 +80,7 @@ public: public: SingleSearchContext(std::unique_ptr<QueryTermSimple> qTerm, const NumericAttribute & toBeSearched); - int32_t cmp(DocId docId, int32_t elemId, int32_t & weight) const { + int32_t find(DocId docId, int32_t elemId, int32_t & weight) const { if ( elemId != 0) return -1; const Word &word = _wordData[docId >> _wordShift]; uint32_t valueShift = (docId & _valueShiftMask) << _valueShiftShift; @@ -89,7 +89,7 @@ public: return match(v) ? 0 : -1; } - int32_t cmp(DocId docId, int32_t elemId) const { + int32_t find(DocId docId, int32_t elemId) const { if ( elemId != 0) return -1; const Word &word = _wordData[docId >> _wordShift]; uint32_t valueShift = (docId & _valueShiftMask) << _valueShiftShift; diff --git a/searchlib/src/vespa/searchlib/attribute/singlestringattribute.h b/searchlib/src/vespa/searchlib/attribute/singlestringattribute.h index 8d9fd79717c..4993b295b37 100644 --- a/searchlib/src/vespa/searchlib/attribute/singlestringattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/singlestringattribute.h @@ -89,12 +89,12 @@ public: StringSearchContext(std::move(qTerm), toBeSearched) { } protected: - int32_t onCmp(DocId doc, int32_t elemId, int32_t & weight) const override { + int32_t onFind(DocId doc, int32_t elemId, int32_t &weight) const override { weight = 1; - return onCmp(doc, elemId); + return onFind(doc, elemId); } - int32_t onCmp(DocId doc, int32_t elemId) const override { + int32_t onFind(DocId doc, int32_t elemId) const override { if ( elemId != 0) return -1; const SingleValueStringAttributeT<B> & attr(static_cast<const SingleValueStringAttributeT<B> &>(attribute())); return isMatch(attr._enumStore.getValue(attr._enumIndices[doc])) ? 0 : -1; diff --git a/searchlib/src/vespa/searchlib/attribute/stringbase.cpp b/searchlib/src/vespa/searchlib/attribute/stringbase.cpp index 3e31c9ca2fa..b9efd5bc6bd 100644 --- a/searchlib/src/vespa/searchlib/attribute/stringbase.cpp +++ b/searchlib/src/vespa/searchlib/attribute/stringbase.cpp @@ -274,7 +274,7 @@ public: } int32_t -StringAttribute::StringSearchContext::onCmp(DocId docId, int32_t elemId, int32_t & weight) const +StringAttribute::StringSearchContext::onFind(DocId docId, int32_t elemId, int32_t &weight) const { WeightedConstChar * buffer = getBuffer(); uint32_t valueCount = attribute().get(docId, buffer, _bufferLen); @@ -287,7 +287,7 @@ StringAttribute::StringSearchContext::onCmp(DocId docId, int32_t elemId, int32_t } int32_t -StringAttribute::StringSearchContext::onCmp(DocId docId, int32_t elemId) const +StringAttribute::StringSearchContext::onFind(DocId docId, int32_t elemId) const { WeightedConstChar * buffer = getBuffer(); uint32_t valueCount = attribute().get(docId, buffer, _bufferLen); diff --git a/searchlib/src/vespa/searchlib/attribute/stringbase.h b/searchlib/src/vespa/searchlib/attribute/stringbase.h index d3394b8280d..51352863980 100644 --- a/searchlib/src/vespa/searchlib/attribute/stringbase.h +++ b/searchlib/src/vespa/searchlib/attribute/stringbase.h @@ -158,8 +158,8 @@ private: } - int32_t onCmp(DocId docId, int32_t elementId, int32_t & weight) const override; - int32_t onCmp(DocId docId, int32_t elementId) const override; + int32_t onFind(DocId docId, int32_t elementId, int32_t &weight) const override; + int32_t onFind(DocId docId, int32_t elementId) const override; bool isPrefix() const { return _isPrefix; } bool isRegex() const { return _isRegex; } |