Merge pull request #13513 from vespa-engine/arnej/fix-inconsistent-visibility

keep createFilterSearch public in subclasses

2 files changed, 12 insertions, 15 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;
diff --git a/searchlib/src/vespa/searchlib/queryeval/leaf_blueprints.h b/searchlib/src/vespa/searchlib/queryeval/leaf_blueprints.h
index d2e86ac65a4..5bba87c7091 100644
--- a/searchlib/src/vespa/searchlib/queryeval/leaf_blueprints.h
+++ b/searchlib/src/vespa/searchlib/queryeval/leaf_blueprints.h
@@ -15,11 +15,11 @@ class EmptyBlueprint : public SimpleLeafBlueprint
 {
 protected:
     SearchIterator::UP createLeafSearch(const search::fef::TermFieldMatchDataArray &tfmda, bool strict) const override;
-    SearchIterator::UP createFilterSearch(bool strict, FilterConstraint constraint) const override;
 public:
     EmptyBlueprint(const FieldSpecBaseList &fields);
     EmptyBlueprint(const FieldSpecBase &field);
     EmptyBlueprint();
+    SearchIterator::UP createFilterSearch(bool strict, FilterConstraint constraint) const override;
 };
 
 //-----------------------------------------------------------------------------
@@ -31,16 +31,14 @@ private:
     SimpleResult _result;
 
 protected:
-    SearchIterator::UP
+    SearchIterator::UP 
     createLeafSearch(const search::fef::TermFieldMatchDataArray &tfmda, bool strict) const override;
-    SearchIterator::UP
-    createFilterSearch(bool strict, FilterConstraint constraint) const override;
-
 public:
     SimpleBlueprint(const SimpleResult &result);
     ~SimpleBlueprint();
     SimpleBlueprint &tag(const vespalib::string &tag);
     const vespalib::string &tag() const { return _tag; }
+    SearchIterator::UP createFilterSearch(bool strict, FilterConstraint constraint) const override;
 };
 
 //-----------------------------------------------------------------------------