Revert "Balder/refactor docentry"

3 files changed, 7 insertions, 9 deletions

diff --git a/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp b/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp
index a936146fd26..b6244521a46 100644
--- a/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp
+++ b/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp
@@ -10,8 +10,6 @@
 #include <vespa/searchvisitor/searchvisitor.h>
 #include <vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h>
 #include <vespa/storageframework/defaultimplementation/clock/fakeclock.h>
-#include <vespa/persistence/spi/docentry.h>
-
 
 #include <vespa/log/log.h>
 LOG_SETUP("searchvisitor_test");
@@ -55,13 +53,14 @@ SearchVisitorTest::SearchVisitorTest() :
 
 SearchVisitorTest::~SearchVisitorTest() = default;
 
-Visitor::DocEntryList
+std::vector<spi::DocEntry::UP>
 createDocuments(const vespalib::string & dir)
 {
     (void) dir;
-    Visitor::DocEntryList documents;
+    std::vector<spi::DocEntry::UP> documents;
     spi::Timestamp ts;
-    auto e = spi::DocEntry::create(ts, std::make_unique<Document>());
+    document::Document::UP doc(new document::Document());
+    spi::DocEntry::UP e(new spi::DocEntry(ts, 0, std::move(doc)));
     documents.push_back(std::move(e));
     return documents;
 }
@@ -73,7 +72,7 @@ SearchVisitorTest::testCreateSearchVisitor(const vespalib::string & dir, const v
     VisitorFactory & factory(sFactory);
     std::unique_ptr<Visitor> sv(static_cast<SearchVisitor *>(factory.makeVisitor(*_component, _env, params)));
     document::BucketId bucketId;
-    Visitor::DocEntryList documents(createDocuments(dir));
+    std::vector<spi::DocEntry::UP> documents(createDocuments(dir));
     Visitor::HitCounter hitCounter;
     sv->handleDocuments(bucketId, documents, hitCounter);
 }
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index 460a0886ee2..cc6323c3053 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -3,7 +3,6 @@
 #include "querytermdata.h"
 #include "searchenvironment.h"
 #include "searchvisitor.h"
-#include <vespa/persistence/spi/docentry.h>
 #include <vespa/document/datatype/positiondatatype.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/datatype/weightedsetdatatype.h>
@@ -865,7 +864,7 @@ SearchVisitor::compatibleDocumentTypes(const document::DocumentType& typeA,
 
 void
 SearchVisitor::handleDocuments(const document::BucketId&,
-                               DocEntryList & entries,
+                               std::vector<storage::spi::DocEntry::UP>& entries,
                                HitCounter& hitCounter)
 {
     (void) hitCounter;
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
index 20ab1ccf325..dff263b8418 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
@@ -298,7 +298,7 @@ private:
 
     // Inherit doc from Visitor
     void handleDocuments(const document::BucketId&,
-                         DocEntryList& entries,
+                         std::vector<storage::spi::DocEntry::UP>& entries,
                          HitCounter& hitCounter) override;
 
     bool compatibleDocumentTypes(const document::DocumentType& typeA,