GC unused includes and code.

Unify with nested includes.

3 files changed, 2 insertions, 15 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp
index 1bcbe4e9683..8175e612bd4 100644
--- a/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp
+++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp
@@ -1,6 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "document_iterator.h"
+#include <vespa/searchcore/proton/common/cachedselect.h>
+#include <vespa/searchcore/proton/common/selectcontext.h>
 #include <vespa/document/select/gid_filter.h>
 #include <vespa/document/select/node.h>
 #include <vespa/document/fieldvalue/document.h>
@@ -42,13 +44,6 @@ DocEntry *createDocEntry(Timestamp timestamp, bool removed, Document::UP doc, ss
 } // namespace proton::<unnamed>
 
 bool
-DocumentIterator::useDocumentSelection() const
-{
-    return (!_metaOnly &&
-            !_selection.getDocumentSelection().getDocumentSelection().empty());
-}
-
-bool
 DocumentIterator::checkMeta(const search::DocumentMetaData &meta) const
 {
     if (!meta.valid()) {
diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.h b/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.h
index 285b3cb2afa..67242e8220f 100644
--- a/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.h
+++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.h
@@ -3,8 +3,6 @@
 #pragma once
 
 #include "i_document_retriever.h"
-#include <vespa/searchcore/proton/common/cachedselect.h>
-#include <vespa/searchcore/proton/common/selectcontext.h>
 #include <vespa/searchlib/common/idocumentmetastore.h>
 #include <vespa/persistence/spi/bucket.h>
 #include <vespa/persistence/spi/selection.h>
@@ -32,10 +30,7 @@ private:
     storage::spi::IterateResult::List     _list;
 
 
-    bool useDocumentSelection() const;
     bool checkMeta(const search::DocumentMetaData &meta) const;
-    bool checkDoc(const document::Document &doc) const;
-    bool checkDoc(const SelectContext &sc) const;
     void fetchCompleteSource(const IDocumentRetriever & source, storage::spi::IterateResult::List & list);
     bool isWeakRead() const { return _readConsistency == ReadConsistency::WEAK; }
 
diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h
index 65b49045d1f..5d3be07c532 100644
--- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h
+++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h
@@ -5,12 +5,9 @@
 #include "i_resource_write_filter.h"
 #include "persistence_handler_map.h"
 #include "ipersistencehandler.h"
-#include <vespa/document/bucket/bucketspace.h>
 #include <vespa/persistence/spi/abstractpersistenceprovider.h>
-#include <vespa/searchcore/proton/common/handlermap.hpp>
 #include <mutex>
 #include <shared_mutex>
-#include <unordered_map>
 
 namespace proton {