Remove traces of SearchableDocumentRetriever

4 files changed, 1 insertions, 24 deletions

diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
index afe1253ed93..4744b13951a 100644
--- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
@@ -14,7 +14,6 @@ LOG_SETUP("document_subdbs_test");
 #include <vespa/searchcore/proton/server/fast_access_document_retriever.h>
 #include <vespa/searchcore/proton/server/idocumentsubdb.h>
 #include <vespa/searchcore/proton/server/minimal_document_retriever.h>
-#include <vespa/searchcore/proton/server/searchable_document_retriever.h>
 #include <vespa/searchcore/proton/server/searchabledocsubdb.h>
 #include <vespa/searchcore/proton/test/test.h>
 #include <vespa/searchcore/proton/test/thread_utils.h>
@@ -497,7 +496,7 @@ TEST_F("require that managers and components are instantiated", SearchableFixtur
 	EXPECT_TRUE(f._subDb.getSearchView().get() != NULL);
 	EXPECT_TRUE(dynamic_cast<SearchableFeedView *>(f._subDb.getFeedView().get()) != NULL);
 	EXPECT_TRUE(dynamic_cast<SearchView *>(f._subDb.getSearchView().get()) != NULL);
-	EXPECT_TRUE(dynamic_cast<SearchableDocumentRetriever *>(f._subDb.getDocumentRetriever().get()) != NULL);
+	EXPECT_TRUE(dynamic_cast<FastAccessDocumentRetriever *>(f._subDb.getDocumentRetriever().get()) != NULL);
 }
 
 template<typename Fixture>
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.h b/searchcore/src/vespa/searchcore/proton/server/documentdb.h
index b6fc9cef004..2af766d0f41 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.h
@@ -16,7 +16,6 @@
 #include "maintenancecontroller.h"
 #include "protonconfigurer.h"
 #include "searchable_doc_subdb_configurer.h"
-#include "searchable_document_retriever.h"
 #include "searchabledocsubdb.h"
 #include "summaryadapter.h"
 #include "visibilityhandler.h"
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_document_retriever.h b/searchcore/src/vespa/searchcore/proton/server/searchable_document_retriever.h
deleted file mode 100644
index cde180a230d..00000000000
--- a/searchcore/src/vespa/searchcore/proton/server/searchable_document_retriever.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#pragma once
-
-#include "fast_access_document_retriever.h"
-#include "searchable_feed_view.h"
-#include "searchview.h"
-
-namespace proton {
-
-class SearchableDocumentRetriever : public FastAccessDocumentRetriever {
-public:
-    // Assumes the FeedView also ensures that the MatchView stays alive.
-    SearchableDocumentRetriever(const SearchableFeedView::SP &fw, const SearchView::SP &sv) :
-        FastAccessDocumentRetriever(fw, sv->getAttributeManager())
-    { }
-};
-
-} // namespace proton
-
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
index b02c84f4666..980dcc378fd 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
@@ -4,7 +4,6 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.searchabledocsubdb");
 
-#include "searchable_document_retriever.h"
 #include "searchabledocsubdb.h"
 #include <vespa/searchcore/proton/attribute/attribute_writer.h>
 #include <vespa/searchcore/proton/flushengine/threadedflushtarget.h>