Extend MemoryIndex to take an instance of IFieldLengthInspector to setup field length calculators per field index.

2 files changed, 8 insertions, 4 deletions

diff --git a/searchcorespi/src/vespa/searchcorespi/index/iindexmaintaineroperations.h b/searchcorespi/src/vespa/searchcorespi/index/iindexmaintaineroperations.h
index 507ccf9483b..99f17b12b79 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/iindexmaintaineroperations.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/iindexmaintaineroperations.h
@@ -6,6 +6,7 @@
 #include <vespa/searchcommon/common/schema.h>
 #include <vespa/searchlib/common/serialnum.h>
 #include <vespa/searchlib/diskindex/docidmapper.h>
+#include <vespa/searchlib/index/i_field_length_inspector.h>
 
 namespace searchcorespi::index {
 
@@ -13,6 +14,7 @@ namespace searchcorespi::index {
  * Interface for operations needed by an index maintainer.
  */
 struct IIndexMaintainerOperations {
+    using IFieldLengthInspector = search::index::IFieldLengthInspector;
     using Schema = search::index::Schema;
     using SelectorArray = search::diskindex::SelectorArray;
     virtual ~IIndexMaintainerOperations() {}
@@ -20,7 +22,9 @@ struct IIndexMaintainerOperations {
     /**
      * Creates a new memory index using the given schema.
      */
-    virtual IMemoryIndex::SP createMemoryIndex(const Schema &schema, search::SerialNum serialNum) = 0;
+    virtual IMemoryIndex::SP createMemoryIndex(const Schema& schema,
+                                               const IFieldLengthInspector& inspector,
+                                               search::SerialNum serialNum) = 0;
 
     /**
      * Loads a disk index from the given directory.
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
index acde26ad554..a174592eb55 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
@@ -870,11 +870,11 @@ IndexMaintainer::IndexMaintainer(const IndexMaintainerConfig &config,
         _selector.reset(getSourceSelector().cloneAndSubtract(ost.str(), id_diff).release());
         assert(_last_fusion_id == _selector->getBaseId());
     }
-    _current_index = operations.createMemoryIndex(_schema, _current_serial_num);
     _current_index_id = getNewAbsoluteId() - _last_fusion_id;
     assert(_current_index_id < ISourceSelector::SOURCE_LIMIT);
     _selector->setDefaultSource(_current_index_id);
     ISearchableIndexCollection::UP sourceList(loadDiskIndexes(spec, ISearchableIndexCollection::UP(new IndexCollection(_selector))));
+    _current_index = operations.createMemoryIndex(_schema, *sourceList, _current_serial_num);
     LOG(debug, "Index manager created with flushed serial num %" PRIu64, _flush_serial_num);
     sourceList->append(_current_index_id, _current_index);
     sourceList->setCurrentIndex(_current_index_id);
@@ -900,7 +900,7 @@ IndexMaintainer::initFlush(SerialNum serialNum, searchcorespi::FlushStats * stat
         _current_serial_num = std::max(_current_serial_num, serialNum);
     }
 
-    IMemoryIndex::SP new_index(_operations.createMemoryIndex(getSchema(), _current_serial_num));
+    IMemoryIndex::SP new_index(_operations.createMemoryIndex(getSchema(), *_current_index, _current_serial_num));
     FlushArgs args;
     args.stats = stats;
     scheduleCommit();
@@ -1208,7 +1208,7 @@ IndexMaintainer::setSchema(const Schema & schema, SerialNum serialNum)
 {
     assert(_ctx.getThreadingService().master().isCurrentThread());
     pruneRemovedFields(schema, serialNum);
-    IMemoryIndex::SP new_index(_operations.createMemoryIndex(schema, _current_serial_num));
+    IMemoryIndex::SP new_index(_operations.createMemoryIndex(schema, *_current_index, _current_serial_num));
     SetSchemaArgs args;
 
     args._newSchema = schema;