diff options
author | Geir Storli <geirst@verizonmedia.com> | 2019-04-10 09:00:34 +0000 |
---|---|---|
committer | Geir Storli <geirst@verizonmedia.com> | 2019-04-11 06:48:56 +0000 |
commit | 7e34fb655b23c87a18ab078cdf957c3dbad5e0e5 (patch) | |
tree | d5355a3ca8b93694e1e6a1130972d481dcc39bc5 | |
parent | bfe1e8324d9d7702203022609c4d5a3539bc8b97 (diff) |
Rename search::memoryindex::IDocumentInsertListener -> IFieldIndexInsertListener.
5 files changed, 33 insertions, 26 deletions
diff --git a/searchlib/src/vespa/searchlib/memoryindex/document_remover.h b/searchlib/src/vespa/searchlib/memoryindex/document_remover.h index 3cf37cab410..d954bf784a1 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/document_remover.h +++ b/searchlib/src/vespa/searchlib/memoryindex/document_remover.h @@ -2,7 +2,7 @@ #pragma once #include "compact_document_words_store.h" -#include "i_document_insert_listener.h" +#include "i_field_index_insert_listener.h" namespace search::memoryindex { @@ -12,7 +12,7 @@ class WordStore; /** * Class used to remove documents from the memory index dictionary. */ -class DocumentRemover : public IDocumentInsertListener { +class DocumentRemover : public IFieldIndexInsertListener { private: struct WordFieldDocTuple { datastore::EntryRef _wordRef; @@ -50,7 +50,7 @@ public: CompactDocumentWordsStore &getStore() { return _store; } const CompactDocumentWordsStore &getStore() const { return _store; } - // Implements IDocumentInsertListener + // Implements IFieldIndexInsertListener void insert(datastore::EntryRef wordRef, uint32_t docId) override; void flush() override; }; diff --git a/searchlib/src/vespa/searchlib/memoryindex/i_document_insert_listener.h b/searchlib/src/vespa/searchlib/memoryindex/i_document_insert_listener.h deleted file mode 100644 index 40b7356386e..00000000000 --- a/searchlib/src/vespa/searchlib/memoryindex/i_document_insert_listener.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#pragma once -#include <vespa/searchlib/datastore/entryref.h> - -namespace search::memoryindex { - -/** - * Interface used to track which {wordRef, fieldId} pairs that are - * inserted into the memory index dictionary for a document. - */ -class IDocumentInsertListener { -public: - virtual ~IDocumentInsertListener() {} - virtual void insert(datastore::EntryRef wordRef, uint32_t docId) = 0; - virtual void flush() = 0; -}; - -} - diff --git a/searchlib/src/vespa/searchlib/memoryindex/i_field_index_insert_listener.h b/searchlib/src/vespa/searchlib/memoryindex/i_field_index_insert_listener.h new file mode 100644 index 00000000000..0aacfa53c34 --- /dev/null +++ b/searchlib/src/vespa/searchlib/memoryindex/i_field_index_insert_listener.h @@ -0,0 +1,26 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#pragma once +#include <vespa/searchlib/datastore/entryref.h> + +namespace search::memoryindex { + +/** + * Interface used to track which {wordRef, docId} pairs that are inserted into a FieldIndex. + */ +class IFieldIndexInsertListener { +public: + virtual ~IFieldIndexInsertListener() {} + + /** + * Called when a {wordRef, docId} tuple is inserted into the field index. + */ + virtual void insert(datastore::EntryRef wordRef, uint32_t docId) = 0; + + /** + * Called to process the set of {wordRef, docId} tuples inserted since last flush(). + */ + virtual void flush() = 0; +}; + +} + diff --git a/searchlib/src/vespa/searchlib/memoryindex/ordered_field_index_inserter.cpp b/searchlib/src/vespa/searchlib/memoryindex/ordered_field_index_inserter.cpp index 7813a071b16..9b127a8b096 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/ordered_field_index_inserter.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/ordered_field_index_inserter.cpp @@ -1,12 +1,12 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "i_field_index_insert_listener.h" #include "ordered_field_index_inserter.h" -#include "i_document_insert_listener.h" #include <vespa/searchlib/index/docidandfeatures.h> #include <vespa/vespalib/stllike/string.h> -#include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/exceptions.h> +#include <vespa/vespalib/util/stringfmt.h> #include <vespa/searchlib/btree/btreenode.hpp> #include <vespa/searchlib/btree/btreenodeallocator.hpp> diff --git a/searchlib/src/vespa/searchlib/memoryindex/ordered_field_index_inserter.h b/searchlib/src/vespa/searchlib/memoryindex/ordered_field_index_inserter.h index c1945ed3996..03cf3723f01 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/ordered_field_index_inserter.h +++ b/searchlib/src/vespa/searchlib/memoryindex/ordered_field_index_inserter.h @@ -8,7 +8,7 @@ namespace search::memoryindex { -class IDocumentInsertListener; +class IFieldIndexInsertListener; /** * Class used to insert inverted documents into a FieldIndex, @@ -31,7 +31,7 @@ private: using PostingListKeyDataType = FieldIndex::PostingListKeyDataType; FieldIndex &_fieldIndex; DictionaryTree::Iterator _dItr; - IDocumentInsertListener &_listener; + IFieldIndexInsertListener &_listener; // Pending changes to posting list for (_word) std::vector<uint32_t> _removes; |