- Hide members

- Remove unused methods.
- Set params in constructor and make them const.
- reorder members to reduce holes in struct.

2 files changed, 20 insertions, 28 deletions

diff --git a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
index 272d74cde2c..ca8eaa176a4 100644
--- a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
+++ b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
@@ -25,7 +25,6 @@
 #include <vespa/searchlib/util/filekit.h>
 #include <vespa/vespalib/btree/btreenode.hpp>
 #include <vespa/vespalib/btree/btreenodeallocator.hpp>
-#include <vespa/vespalib/btree/btreeroot.hpp>
 #include <vespa/vespalib/util/gate.h>
 #include <vespa/vespalib/util/destructor_callbacks.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
@@ -363,11 +362,11 @@ FusionTest::requireThatFusionIsWorking(const vespalib::string &prefix, bool dire
     inv.invertDocument(12, *doc, {});
     myPushDocument(inv);
 
-    IndexBuilder ib(schema);
-    vespalib::string dump2dir = prefix + "dump2";
-    ib.setPrefix(dump2dir);
-    uint32_t numDocs = 12 + 1;
-    uint32_t numWords = fic.getNumUniqueWords();
+
+    const vespalib::string dump2dir = prefix + "dump2";
+    constexpr uint32_t numDocs = 12 + 1;
+    IndexBuilder ib(schema, dump2dir, numDocs);
+    const uint32_t numWords = fic.getNumUniqueWords();
     MockFieldLengthInspector mock_field_length_inspector;
     TuneFileIndexing tuneFileIndexing;
     TuneFileSearch tuneFileSearch;
@@ -380,7 +379,7 @@ FusionTest::requireThatFusionIsWorking(const vespalib::string &prefix, bool dire
     if (readmmap) {
         tuneFileSearch._read.setWantMemoryMap();
     }
-    ib.open(numDocs, numWords, mock_field_length_inspector, tuneFileIndexing, fileHeaderContext);
+    ib.open(numWords, mock_field_length_inspector, tuneFileIndexing, fileHeaderContext);
     fic.dump(ib);
     ib.close();
 
@@ -475,8 +474,8 @@ void
 FusionTest::make_simple_index(const vespalib::string &dump_dir, const IFieldLengthInspector &field_length_inspector)
 {
     FieldIndexCollection fic(_schema, field_length_inspector);
-    uint32_t numDocs = 20;
-    uint32_t numWords = 1000;
+    constexpr  uint32_t numDocs = 20;
+    constexpr uint32_t numWords = 1000;
     DocBuilder b(make_add_fields());
     auto invertThreads = SequencedTaskExecutor::create(invert_executor, 2);
     auto pushThreads = SequencedTaskExecutor::create(push_executor, 2);
@@ -487,11 +486,10 @@ FusionTest::make_simple_index(const vespalib::string &dump_dir, const IFieldLeng
     inv.invertDocument(10, *doc10, {});
     myPushDocument(inv);
 
-    IndexBuilder ib(_schema);
+    IndexBuilder ib(_schema, dump_dir, numDocs);
     TuneFileIndexing tuneFileIndexing;
     DummyFileHeaderContext fileHeaderContext;
-    ib.setPrefix(dump_dir);
-    ib.open(numDocs, numWords, field_length_inspector, tuneFileIndexing, fileHeaderContext);
+    ib.open(numWords, field_length_inspector, tuneFileIndexing, fileHeaderContext);
     fic.dump(ib);
     ib.close();
 }
@@ -503,8 +501,7 @@ FusionTest::try_merge_simple_indexes(const vespalib::string &dump_dir, const std
     TuneFileIndexing tuneFileIndexing;
     DummyFileHeaderContext fileHeaderContext;
     SelectorArray selector(20, 0);
-    Fusion fusion(_schema, dump_dir, sources, selector,
-                  tuneFileIndexing, fileHeaderContext);
+    Fusion fusion(_schema, dump_dir, sources, selector, tuneFileIndexing, fileHeaderContext);
     fusion.set_force_small_merge_chunk(_force_small_merge_chunk);
     return fusion.merge(executor, flush_token);
 }
diff --git a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
index 42d55c8f769..5f8b6b2df48 100644
--- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
+++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
@@ -86,7 +86,7 @@ public:
           _firstDoc(true)
     {}
 
-    virtual void startWord(vespalib::stringref word) override {
+    void startWord(vespalib::stringref word) override {
         assert(_insideField);
         assert(!_insideWord);
         if (!_firstWord)
@@ -96,14 +96,14 @@ public:
         _insideWord = true;
     }
 
-    virtual void endWord() override {
+    void endWord() override {
         assert(_insideWord);
         _ss << "]";
         _firstWord = false;
         _insideWord = false;
     }
 
-    virtual void startField(uint32_t fieldId) override {
+    void startField(uint32_t fieldId) override {
         assert(!_insideField);
         if (!_firstField) _ss << ",";
         _ss << "f=" << fieldId << "[";
@@ -111,7 +111,7 @@ public:
         _insideField = true;
     }
 
-    virtual void endField() override {
+    void endField() override {
         assert(_insideField);
         assert(!_insideWord);
         _ss << "]";
@@ -119,7 +119,7 @@ public:
         _insideField = false;
     }
 
-    virtual void add_document(const DocIdAndFeatures &features) override {
+    void add_document(const DocIdAndFeatures &features) override {
         assert(_insideWord);
         if (!_firstDoc) {
             _ss << ",";
@@ -875,11 +875,10 @@ TEST_F(FieldIndexCollectionTest, require_that_dumping_words_with_no_docs_to_inde
                   b.toStr());
     }
     {
-        search::diskindex::IndexBuilder b(schema);
-        b.setPrefix("dump");
+        search::diskindex::IndexBuilder b(schema, "dump", 5);
         TuneFileIndexing tuneFileIndexing;
         DummyFileHeaderContext fileHeaderContext;
-        b.open(5, 2, MockFieldLengthInspector(), tuneFileIndexing, fileHeaderContext);
+        b.open(2, MockFieldLengthInspector(), tuneFileIndexing, fileHeaderContext);
         fic.dump(b);
         b.close();
     }
@@ -1224,14 +1223,10 @@ TEST_F(UriInverterTest, require_that_uri_indexing_is_working)
         EXPECT_TRUE(itr->isAtEnd());
     }
     {
-        search::diskindex::IndexBuilder dib(_schema);
-        dib.setPrefix("urldump");
+        search::diskindex::IndexBuilder dib(_schema, "urldump", 11);
         TuneFileIndexing tuneFileIndexing;
         DummyFileHeaderContext fileHeaderContext;
-        dib.open(11, _fic.getNumUniqueWords(),
-                 MockFieldLengthInspector(),
-                 tuneFileIndexing,
-                 fileHeaderContext);
+        dib.open(_fic.getNumUniqueWords(), MockFieldLengthInspector(), tuneFileIndexing, fileHeaderContext);
         _fic.dump(dib);
         dib.close();
     }