diff options
author | Tor Egge <Tor.Egge@oath.com> | 2018-04-24 12:08:10 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2018-04-24 12:08:10 +0000 |
commit | 1c6dd57f2bb6ecb322186870c516a469765cffaa (patch) | |
tree | 2f960afeba09d409c2c95e08d2d05269abc0cab4 /searchlib | |
parent | 6a7351dc77ad191540b61555360d20caea94c156 (diff) |
Make getCommittedDocIdLimit() method virtual.
Remove getCommittedDocidLimitSlow() method.
Diffstat (limited to 'searchlib')
5 files changed, 6 insertions, 7 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp index e92c7e38114..5261eb0bb05 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp +++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp @@ -340,9 +340,9 @@ AttributeVector::getIsFastSearch() const { } uint32_t -AttributeVector::getCommittedDocIdLimitSlow() const +AttributeVector::getCommittedDocIdLimit() const { - return getCommittedDocIdLimit(); + return _committedDocIdLimit; } bool diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h index 9d69bf587ed..470e612770d 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributevector.h +++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h @@ -417,7 +417,6 @@ public: // Implements IAttributeVector uint32_t getNumDocs() const override; - uint32_t getCommittedDocIdLimit() const { return _committedDocIdLimit; } uint32_t & getCommittedDocIdLimitRef() { return _committedDocIdLimit; } void setCommittedDocIdLimit(uint32_t committedDocIdLimit) { _committedDocIdLimit = committedDocIdLimit; @@ -433,7 +432,7 @@ public: virtual CollectionType::Type getCollectionType() const override; virtual bool getIsFilter() const override; virtual bool getIsFastSearch() const override; - virtual uint32_t getCommittedDocIdLimitSlow() const override; + virtual uint32_t getCommittedDocIdLimit() const override; virtual bool isImported() const override; /** diff --git a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.cpp b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.cpp index a27c73e112e..4aa55529b77 100644 --- a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.cpp +++ b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.cpp @@ -142,7 +142,7 @@ bool ImportedAttributeVectorReadGuard::getIsFastSearch() const { return _target_attribute.getIsFastSearch(); } -uint32_t ImportedAttributeVectorReadGuard::getCommittedDocIdLimitSlow() const { +uint32_t ImportedAttributeVectorReadGuard::getCommittedDocIdLimit() const { return _reference_attribute.getCommittedDocIdLimit(); } diff --git a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.h b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.h index 6c8dca11d31..d32b7e5815c 100644 --- a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.h +++ b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.h @@ -75,7 +75,7 @@ public: virtual bool hasEnum() const override; virtual bool getIsFilter() const override; virtual bool getIsFastSearch() const override; - virtual uint32_t getCommittedDocIdLimitSlow() const override; + virtual uint32_t getCommittedDocIdLimit() const override; virtual bool isImported() const override; protected: diff --git a/searchlib/src/vespa/searchlib/attribute/imported_search_context.cpp b/searchlib/src/vespa/searchlib/attribute/imported_search_context.cpp index 3c4029627df..6a78a87e20b 100644 --- a/searchlib/src/vespa/searchlib/attribute/imported_search_context.cpp +++ b/searchlib/src/vespa/searchlib/attribute/imported_search_context.cpp @@ -195,7 +195,7 @@ public: void ImportedSearchContext::makeMergedPostings(bool isFilter) { - uint32_t committedTargetDocIdLimit = _target_attribute.getCommittedDocIdLimitSlow(); + uint32_t committedTargetDocIdLimit = _target_attribute.getCommittedDocIdLimit(); std::atomic_thread_fence(std::memory_order_acquire); const auto &reverseMapping = _reference_attribute.getReverseMapping(); if (isFilter) { |