WhiteListProvider no longer used

6 files changed, 1 insertions, 34 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/documentmetastore/CMakeLists.txt
index 63ff53bb011..d257f29c9df 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/CMakeLists.txt
@@ -16,7 +16,6 @@ vespa_add_library(searchcore_documentmetastore STATIC
     lidreusedelayer.cpp
     lidstatevector.cpp
     lid_hold_list.cpp
-    white_list_provider.cpp
     DEPENDS
     searchcore_attribute
     searchcore_bucketdb
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp
index 31361e40c68..d5f932c4041 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "lid_allocator.h"
-#include "white_list_provider.h"
 #include <vespa/searchlib/common/bitvectoriterator.h>
 #include <vespa/searchlib/fef/termfieldmatchdataarray.h>
 #include <vespa/searchlib/fef/matchdata.h>
@@ -192,17 +191,13 @@ LidAllocator::constructFreeList(DocId lidLimit)
 
 namespace {
 
-class WhiteListBlueprint : public SimpleLeafBlueprint, public WhiteListProvider
+class WhiteListBlueprint : public SimpleLeafBlueprint
 {
 private:
     const search::GrowableBitVector &_activeLids;
     mutable std::mutex _lock;
     mutable std::vector<search::fef::TermFieldMatchData *> _matchDataVector;
 
-    search::BitVector::UP get_white_list_filter() const override {
-        return search::BitVector::create(_activeLids, 0, get_docid_limit());
-    }
-
     SearchIterator::UP
     createLeafSearch(const TermFieldMatchDataArray &tfmda, bool strict) const override
     {
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/white_list_provider.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/white_list_provider.cpp
deleted file mode 100644
index 49ea1960005..00000000000
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/white_list_provider.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "white_list_provider.h"
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/white_list_provider.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/white_list_provider.h
deleted file mode 100644
index 99e0bf8d103..00000000000
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/white_list_provider.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include <memory>
-
-#pragma once
-
-namespace search { class BitVector; }
-
-namespace proton::documentmetastore {
-
-/** Interface for fetching a copy of the white list bitvector */
-struct WhiteListProvider {
-    virtual std::unique_ptr<search::BitVector> get_white_list_filter() const = 0;
-protected:
-    ~WhiteListProvider() = default;
-};
-
-} // namespace
diff --git a/searchcore/src/vespa/searchcore/proton/matching/query.cpp b/searchcore/src/vespa/searchcore/proton/matching/query.cpp
index b12b20d2031..8fd686e235d 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/query.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/query.cpp
@@ -13,7 +13,6 @@
 #include <vespa/searchlib/query/tree/point.h>
 #include <vespa/searchlib/query/tree/rectangle.h>
 #include <vespa/searchlib/queryeval/intermediate_blueprints.h>
-#include <vespa/searchcore/proton/documentmetastore/white_list_provider.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.matching.query");
@@ -157,7 +156,6 @@ void
 Query::setWhiteListBlueprint(Blueprint::UP whiteListBlueprint)
 {
     _whiteListBlueprint = std::move(whiteListBlueprint);
-    _white_list_provider = dynamic_cast<WhiteListProvider *>(_whiteListBlueprint.get());
 }
 
 void
diff --git a/searchcore/src/vespa/searchcore/proton/matching/query.h b/searchcore/src/vespa/searchcore/proton/matching/query.h
index 1aecb7136b1..3ed6229830d 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/query.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/query.h
@@ -10,8 +10,6 @@
 #include <vespa/searchlib/queryeval/blueprint.h>
 #include <vespa/searchlib/queryeval/irequestcontext.h>
 
-namespace proton::documentmetastore { struct WhiteListProvider; }
-
 namespace proton::matching {
 
 class ViewResolver;
@@ -21,12 +19,10 @@ class Query
 {
 private:
     using Blueprint=search::queryeval::Blueprint;
-    using WhiteListProvider=proton::documentmetastore::WhiteListProvider;
     search::query::Node::UP _query_tree;
     Blueprint::UP           _blueprint;
     search::fef::Location   _location;
     Blueprint::UP           _whiteListBlueprint;
-    WhiteListProvider      *_white_list_provider;
 
 public:
     Query();