Rename search::memoryindex::IDocumentRemoveListener -> IFieldIndexRemoveListener.

8 files changed, 24 insertions, 21 deletions

diff --git a/searchlib/src/tests/memoryindex/document_remover/document_remover_test.cpp b/searchlib/src/tests/memoryindex/document_remover/document_remover_test.cpp
index af7a9422e49..101770d7807 100644
--- a/searchlib/src/tests/memoryindex/document_remover/document_remover_test.cpp
+++ b/searchlib/src/tests/memoryindex/document_remover/document_remover_test.cpp
@@ -3,8 +3,8 @@
 #include <vespa/vespalib/testkit/testapp.h>
 
 #include <vespa/searchlib/memoryindex/document_remover.h>
+#include <vespa/searchlib/memoryindex/i_field_index_remove_listener.h>
 #include <vespa/searchlib/memoryindex/wordstore.h>
-#include <vespa/searchlib/memoryindex/i_document_remove_listener.h>
 #include <vespa/vespalib/test/insertion_operators.h>
 #include <algorithm>
 
@@ -38,7 +38,7 @@ operator<<(std::ostream &os, const WordFieldPair &val)
     return os;
 }
 
-struct MockRemoveListener : public IDocumentRemoveListener
+struct MockRemoveListener : public IFieldIndexRemoveListener
 {
     WordFieldVector _words;
     uint32_t _expDocId;
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 324855f1255..bc796c6c617 100644
--- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
+++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
@@ -503,7 +503,7 @@ public:
 };
 
 
-class MyDrainRemoves : IDocumentRemoveListener
+class MyDrainRemoves : IFieldIndexRemoveListener
 {
     DocumentRemover &_remover;
 public:
diff --git a/searchlib/src/vespa/searchlib/memoryindex/document_remover.cpp b/searchlib/src/vespa/searchlib/memoryindex/document_remover.cpp
index 469de8987b1..b060762d238 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/document_remover.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/document_remover.cpp
@@ -1,6 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "document_remover.h"
-#include "i_document_remove_listener.h"
+#include "i_field_index_remove_listener.h"
 #include "wordstore.h"
 #include <vespa/searchlib/common/sort.h>
 
@@ -20,7 +20,7 @@ DocumentRemover::DocumentRemover(const WordStore &wordStore)
 DocumentRemover::~DocumentRemover() = default;
 
 void
-DocumentRemover::remove(uint32_t docId, IDocumentRemoveListener &listener)
+DocumentRemover::remove(uint32_t docId, IFieldIndexRemoveListener &listener)
 {
     Iterator itr = _store.get(docId);
     if (itr.valid()) {
diff --git a/searchlib/src/vespa/searchlib/memoryindex/document_remover.h b/searchlib/src/vespa/searchlib/memoryindex/document_remover.h
index d954bf784a1..848c9f04b45 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/document_remover.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/document_remover.h
@@ -6,7 +6,7 @@
 
 namespace search::memoryindex {
 
-class IDocumentRemoveListener;
+class IFieldIndexRemoveListener;
 class WordStore;
 
 /**
@@ -46,7 +46,7 @@ private:
 public:
     DocumentRemover(const WordStore &wordStore);
     ~DocumentRemover();
-    void remove(uint32_t docId, IDocumentRemoveListener &inverter);
+    void remove(uint32_t docId, IFieldIndexRemoveListener &inverter);
     CompactDocumentWordsStore &getStore() { return _store; }
     const CompactDocumentWordsStore &getStore() const { return _store; }
 
diff --git a/searchlib/src/vespa/searchlib/memoryindex/documentinverter.h b/searchlib/src/vespa/searchlib/memoryindex/documentinverter.h
index 081d875be4f..5c2d9cc84ed 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/documentinverter.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/documentinverter.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "i_document_remove_listener.h"
+#include "i_field_index_remove_listener.h"
 #include <vespa/searchlib/index/schema_index_fields.h>
 
 namespace document {
diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.h b/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.h
index f2fc08f0e82..5c2aa6f9b2c 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.h
@@ -6,7 +6,7 @@
 
 namespace search::memoryindex {
 
-class IDocumentRemoveListener;
+class IFieldIndexRemoveListener;
 class FieldInverter;
 
 /**
diff --git a/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.h b/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.h
index 3dcafce1045..c254da55f39 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.h
@@ -2,23 +2,23 @@
 
 #pragma once
 
-#include <map>
-#include <set>
-#include <vespa/document/fieldvalue/document.h>
+#include "i_field_index_remove_listener.h"
+#include <vespa/document/annotation/span.h>
 #include <vespa/document/datatype/datatypes.h>
-#include <limits>
-#include "i_document_remove_listener.h"
-#include <vespa/searchlib/index/docidandfeatures.h>
+#include <vespa/document/fieldvalue/document.h>
 #include <vespa/searchlib/bitcompression/compression.h>
 #include <vespa/searchlib/bitcompression/posocccompression.h>
-#include <vespa/document/annotation/span.h>
+#include <vespa/searchlib/index/docidandfeatures.h>
+#include <limits>
+#include <map>
+#include <set>
 
 namespace search::memoryindex {
 
 class IOrderedFieldIndexInserter;
 class DocumentRemover;
 
-class FieldInverter : public IDocumentRemoveListener {
+class FieldInverter : public IFieldIndexRemoveListener {
 public:
     class PosInfo {
     public:
diff --git a/searchlib/src/vespa/searchlib/memoryindex/i_document_remove_listener.h b/searchlib/src/vespa/searchlib/memoryindex/i_field_index_remove_listener.h
index 6edbe4d3eaf..4419303a654 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/i_document_remove_listener.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/i_field_index_remove_listener.h
@@ -7,12 +7,15 @@
 namespace search::memoryindex {
 
 /**
- * Interface used to track which {wordRef, fieldId} pairs that are
- * removed from the memory index dictionary for a document.
+ * Interface used to track which {word, docId} pairs that are removed from a FieldIndex.
  */
-class IDocumentRemoveListener {
+class IFieldIndexRemoveListener {
 public:
-    virtual ~IDocumentRemoveListener() {}
+    virtual ~IFieldIndexRemoveListener() {}
+
+    /**
+     * Called when a {word, docId} tuple is removed from the field index.
+     */
     virtual void remove(const vespalib::stringref word, uint32_t docId) = 0;
 };