aboutsummaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHÃ¥vard Pettersen <3535158+havardpe@users.noreply.github.com>2020-06-09 10:02:08 +0200
committerGitHub <noreply@github.com>2020-06-09 10:02:08 +0200
commit0a05aa03fcd44ed9ab879c3b94aea26c127b6b00 (patch)
treeb6a1641604589def0d0ad2b3a88660a9b097bb58 /searchcore
parentdff59cae99bc52c813e40dc529edcfe252de4a53 (diff)
parentab5ca124626e56bfea41dc32b7a4118b17658115 (diff)
Merge pull request #13513 from vespa-engine/arnej/fix-inconsistent-visibility
keep createFilterSearch public in subclasses
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp
index 31361e40c68..ab9072b9449 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp
@@ -210,16 +210,6 @@ private:
(void) tfmda;
return createFilterSearch(strict, FilterConstraint::UPPER_BOUND);
}
-
- SearchIterator::UP createFilterSearch(bool strict, FilterConstraint) const override {
- auto tfmd = new search::fef::TermFieldMatchData;
- {
- std::lock_guard<std::mutex> lock(_lock);
- _matchDataVector.push_back(tfmd);
- }
- return search::BitVectorIterator::create(&_activeLids, get_docid_limit(), *tfmd, strict);
- }
-
public:
WhiteListBlueprint(const search::GrowableBitVector &activeLids)
: SimpleLeafBlueprint(FieldSpecBaseList()),
@@ -231,6 +221,15 @@ public:
bool isWhiteList() const override { return true; }
+ SearchIterator::UP createFilterSearch(bool strict, FilterConstraint) const override {
+ auto tfmd = new search::fef::TermFieldMatchData;
+ {
+ std::lock_guard<std::mutex> lock(_lock);
+ _matchDataVector.push_back(tfmd);
+ }
+ return search::BitVectorIterator::create(&_activeLids, get_docid_limit(), *tfmd, strict);
+ }
+
~WhiteListBlueprint() {
for (auto matchData : _matchDataVector) {
delete matchData;