Move portions of DocumentInverter to DocumentInverterContext.

1 files changed, 6 insertions, 2 deletions

diff --git a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
index ed661b7499f..fba488e78aa 100644
--- a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
+++ b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
@@ -10,6 +10,7 @@
 #include <vespa/searchlib/index/docbuilder.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/memoryindex/document_inverter.h>
+#include <vespa/searchlib/memoryindex/document_inverter_context.h>
 #include <vespa/searchlib/memoryindex/field_index_collection.h>
 #include <vespa/searchlib/memoryindex/posting_iterator.h>
 #include <vespa/searchlib/test/index/mock_field_length_inspector.h>
@@ -32,6 +33,7 @@ using fef::FieldPositionsIterator;
 using fef::TermFieldMatchData;
 using fef::TermFieldMatchDataArray;
 using memoryindex::DocumentInverter;
+using memoryindex::DocumentInverterContext;
 using memoryindex::FieldIndexCollection;
 using queryeval::SearchIterator;
 using search::common::FileHeaderContext;
@@ -321,7 +323,8 @@ FusionTest::requireThatFusionIsWorking(const vespalib::string &prefix, bool dire
     DocBuilder b(schema);
     auto invertThreads = SequencedTaskExecutor::create(invert_executor, 2);
     auto pushThreads = SequencedTaskExecutor::create(push_executor, 2);
-    DocumentInverter inv(schema, *invertThreads, *pushThreads, fic);
+    DocumentInverterContext inv_context(schema, *invertThreads, *pushThreads, fic);
+    DocumentInverter inv(inv_context);
     Document::UP doc;
 
     doc = make_doc10(b);
@@ -462,7 +465,8 @@ FusionTest::make_simple_index(const vespalib::string &dump_dir, const IFieldLeng
     DocBuilder b(_schema);
     auto invertThreads = SequencedTaskExecutor::create(invert_executor, 2);
     auto pushThreads = SequencedTaskExecutor::create(push_executor, 2);
-    DocumentInverter inv(_schema, *invertThreads, *pushThreads, fic);
+    DocumentInverterContext inv_context(_schema, *invertThreads, *pushThreads, fic);
+    DocumentInverter inv(inv_context);
 
     inv.invertDocument(10, *make_doc10(b));
     invertThreads->sync_all();