diff options
author | Geir Storli <geirst@verizonmedia.com> | 2019-04-11 11:06:09 +0000 |
---|---|---|
committer | Geir Storli <geirst@verizonmedia.com> | 2019-04-11 11:06:09 +0000 |
commit | 4e7ebfb2793e7a52176eb267e732b0f509194b40 (patch) | |
tree | f11b691132c41acefa390fa361f65525493588d7 /searchlib | |
parent | c61f37ae1a3c6d82c397f0feed20877bd3594a3d (diff) |
Rename search::memoryindex::CompactDocumentWordsStore -> CompactWordsStore.
Diffstat (limited to 'searchlib')
11 files changed, 65 insertions, 65 deletions
diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt index 92ddcf75aa7..66408b1d7d7 100644 --- a/searchlib/CMakeLists.txt +++ b/searchlib/CMakeLists.txt @@ -173,7 +173,7 @@ vespa_define_module( src/tests/index/doctypebuilder src/tests/indexmetainfo src/tests/ld-library-path - src/tests/memoryindex/compact_document_words_store + src/tests/memoryindex/compact_words_store src/tests/memoryindex/datastore src/tests/memoryindex/document_inverter src/tests/memoryindex/field_index diff --git a/searchlib/src/tests/memoryindex/compact_document_words_store/.gitignore b/searchlib/src/tests/memoryindex/compact_document_words_store/.gitignore deleted file mode 100644 index 3ad290f1731..00000000000 --- a/searchlib/src/tests/memoryindex/compact_document_words_store/.gitignore +++ /dev/null @@ -1 +0,0 @@ -searchlib_compact_document_words_store_test_app diff --git a/searchlib/src/tests/memoryindex/compact_document_words_store/CMakeLists.txt b/searchlib/src/tests/memoryindex/compact_document_words_store/CMakeLists.txt deleted file mode 100644 index a5c8e0b2d14..00000000000 --- a/searchlib/src/tests/memoryindex/compact_document_words_store/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_compact_document_words_store_test_app TEST - SOURCES - compact_document_words_store_test.cpp - DEPENDS - searchlib -) -vespa_add_test(NAME searchlib_compact_document_words_store_test_app COMMAND searchlib_compact_document_words_store_test_app) diff --git a/searchlib/src/tests/memoryindex/compact_words_store/.gitignore b/searchlib/src/tests/memoryindex/compact_words_store/.gitignore new file mode 100644 index 00000000000..9f9acb50adc --- /dev/null +++ b/searchlib/src/tests/memoryindex/compact_words_store/.gitignore @@ -0,0 +1 @@ +searchlib_compact_words_store_test_app diff --git a/searchlib/src/tests/memoryindex/compact_words_store/CMakeLists.txt b/searchlib/src/tests/memoryindex/compact_words_store/CMakeLists.txt new file mode 100644 index 00000000000..ee31ef7c7aa --- /dev/null +++ b/searchlib/src/tests/memoryindex/compact_words_store/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(searchlib_compact_words_store_test_app TEST + SOURCES + compact_words_store_test.cpp + DEPENDS + searchlib +) +vespa_add_test(NAME searchlib_compact_words_store_test_app COMMAND searchlib_compact_words_store_test_app) diff --git a/searchlib/src/tests/memoryindex/compact_document_words_store/compact_document_words_store_test.cpp b/searchlib/src/tests/memoryindex/compact_words_store/compact_words_store_test.cpp index 6e22a4e5ff6..04d66396f90 100644 --- a/searchlib/src/tests/memoryindex/compact_document_words_store/compact_document_words_store_test.cpp +++ b/searchlib/src/tests/memoryindex/compact_words_store/compact_words_store_test.cpp @@ -2,7 +2,7 @@ #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchlib/datastore/entryref.h> -#include <vespa/searchlib/memoryindex/compact_document_words_store.h> +#include <vespa/searchlib/memoryindex/compact_words_store.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/stllike/hash_map.hpp> #include <iostream> @@ -12,8 +12,8 @@ using namespace search; using namespace search::datastore; using namespace search::memoryindex; -typedef CompactDocumentWordsStore::Builder Builder; -typedef CompactDocumentWordsStore::Iterator Iterator; +typedef CompactWordsStore::Builder Builder; +typedef CompactWordsStore::Iterator Iterator; typedef Builder::WordRefVector WordRefVector; const EntryRef w1(1); @@ -53,7 +53,7 @@ toStr(Iterator itr) struct SingleFixture { - CompactDocumentWordsStore _store; + CompactWordsStore _store; SingleFixture() : _store() { _store.insert(Builder(d1).insert(w1).insert(w2).insert(w3)); } @@ -61,7 +61,7 @@ struct SingleFixture struct MultiFixture { - CompactDocumentWordsStore _store; + CompactWordsStore _store; MultiFixture() : _store() { _store.insert(Builder(d1).insert(w1)); _store.insert(Builder(d2).insert(w2)); @@ -100,7 +100,7 @@ TEST_F("require that documents can be removed and re-inserted", MultiFixture) TEST("require that a lot of words can be inserted, retrieved and removed") { - CompactDocumentWordsStore store; + CompactWordsStore store; for (uint32_t docId = 0; docId < 50; ++docId) { Builder b(docId); for (uint32_t wordRef = 0; wordRef < 20000; ++wordRef) { @@ -125,9 +125,9 @@ TEST("require that a lot of words can be inserted, retrieved and removed") TEST("require that initial memory usage is reported") { - CompactDocumentWordsStore store; - CompactDocumentWordsStore::DocumentWordsMap docs; - CompactDocumentWordsStore::Store internalStore; + CompactWordsStore store; + CompactWordsStore::DocumentWordsMap docs; + CompactWordsStore::Store internalStore; MemoryUsage initExp; initExp.incAllocatedBytes(docs.getMemoryConsumption()); initExp.incUsedBytes(docs.getMemoryUsed()); @@ -142,7 +142,7 @@ TEST("require that initial memory usage is reported") TEST("require that memory usage is updated after insert") { - CompactDocumentWordsStore store; + CompactWordsStore store; MemoryUsage init = store.getMemoryUsage(); store.insert(Builder(d1).insert(w1)); diff --git a/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt b/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt index 64faee3f3db..441fe12c383 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(searchlib_memoryindex OBJECT SOURCES - compact_document_words_store.cpp + compact_words_store.cpp document_inverter.cpp feature_store.cpp field_index.cpp diff --git a/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.cpp b/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.cpp index e2d089626b1..27282282c11 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.cpp @@ -1,15 +1,15 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "compact_document_words_store.h" +#include "compact_words_store.h" #include <vespa/searchlib/datastore/datastore.hpp> #include <vespa/vespalib/stllike/hash_map.hpp> #include <vespa/log/log.h> -LOG_SETUP(".memoryindex.compact_document_words_store"); +LOG_SETUP(".memoryindex.compact_words_store"); namespace search::memoryindex { -using Builder = CompactDocumentWordsStore::Builder; +using Builder = CompactWordsStore::Builder; namespace { @@ -36,28 +36,28 @@ serialize(const Builder &builder, uint32_t *begin) } -CompactDocumentWordsStore::Builder::Builder(uint32_t docId_) +CompactWordsStore::Builder::Builder(uint32_t docId_) : _docId(docId_), _words() { } -CompactDocumentWordsStore::Builder::~Builder() { } +CompactWordsStore::Builder::~Builder() { } -CompactDocumentWordsStore::Builder & -CompactDocumentWordsStore::Builder::insert(datastore::EntryRef wordRef) +CompactWordsStore::Builder & +CompactWordsStore::Builder::insert(datastore::EntryRef wordRef) { _words.push_back(wordRef); return *this; } inline void -CompactDocumentWordsStore::Iterator::nextWord() +CompactWordsStore::Iterator::nextWord() { _wordRef = *_buf++; _remainingWords--; } -CompactDocumentWordsStore::Iterator::Iterator() +CompactWordsStore::Iterator::Iterator() : _buf(nullptr), _remainingWords(0), _wordRef(0), @@ -65,7 +65,7 @@ CompactDocumentWordsStore::Iterator::Iterator() { } -CompactDocumentWordsStore::Iterator::Iterator(const uint32_t *buf) +CompactWordsStore::Iterator::Iterator(const uint32_t *buf) : _buf(buf), _remainingWords(0), _wordRef(0), @@ -79,8 +79,8 @@ CompactDocumentWordsStore::Iterator::Iterator(const uint32_t *buf) } } -CompactDocumentWordsStore::Iterator & -CompactDocumentWordsStore::Iterator::operator++() +CompactWordsStore::Iterator & +CompactWordsStore::Iterator::operator++() { if (_remainingWords > 0) { nextWord(); @@ -90,7 +90,7 @@ CompactDocumentWordsStore::Iterator::operator++() return *this; } -CompactDocumentWordsStore::Store::Store() +CompactWordsStore::Store::Store() : _store(), _type(1, MIN_BUFFER_ARRAYS, @@ -101,13 +101,13 @@ CompactDocumentWordsStore::Store::Store() _store.initActiveBuffers(); } -CompactDocumentWordsStore::Store::~Store() +CompactWordsStore::Store::~Store() { _store.dropBuffers(); } datastore::EntryRef -CompactDocumentWordsStore::Store::insert(const Builder &builder) +CompactWordsStore::Store::insert(const Builder &builder) { size_t serializedSize = getSerializedSize(builder); auto result = _store.rawAllocator<uint32_t>(_typeId).alloc(serializedSize); @@ -118,26 +118,26 @@ CompactDocumentWordsStore::Store::insert(const Builder &builder) return result.ref; } -CompactDocumentWordsStore::Iterator -CompactDocumentWordsStore::Store::get(datastore::EntryRef ref) const +CompactWordsStore::Iterator +CompactWordsStore::Store::get(datastore::EntryRef wordRef) const { - RefType internalRef(ref); + RefType internalRef(wordRef); const uint32_t *buf = _store.getEntry<uint32_t>(internalRef); return Iterator(buf); } -CompactDocumentWordsStore::CompactDocumentWordsStore() +CompactWordsStore::CompactWordsStore() : _docs(), _wordsStore() { } -CompactDocumentWordsStore::~CompactDocumentWordsStore() { } +CompactWordsStore::~CompactWordsStore() { } void -CompactDocumentWordsStore::insert(const Builder &builder) +CompactWordsStore::insert(const Builder &builder) { - datastore::EntryRef ref = _wordsStore.insert(builder); - auto insres = _docs.insert(std::make_pair(builder.docId(), ref)); + datastore::EntryRef wordRef = _wordsStore.insert(builder); + auto insres = _docs.insert(std::make_pair(builder.docId(), wordRef)); if (!insres.second) { LOG(error, "Failed inserting remove info for docid %u", builder.docId()); @@ -146,13 +146,13 @@ CompactDocumentWordsStore::insert(const Builder &builder) } void -CompactDocumentWordsStore::remove(uint32_t docId) +CompactWordsStore::remove(uint32_t docId) { _docs.erase(docId); } -CompactDocumentWordsStore::Iterator -CompactDocumentWordsStore::get(uint32_t docId) const +CompactWordsStore::Iterator +CompactWordsStore::get(uint32_t docId) const { auto itr = _docs.find(docId); if (itr != _docs.end()) { @@ -162,7 +162,7 @@ CompactDocumentWordsStore::get(uint32_t docId) const } MemoryUsage -CompactDocumentWordsStore::getMemoryUsage() const +CompactWordsStore::getMemoryUsage() const { MemoryUsage usage; usage.incAllocatedBytes(_docs.getMemoryConsumption()); diff --git a/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.h b/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.h index 50988d5121a..2fc6ec8d5bb 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.h +++ b/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.h @@ -10,14 +10,14 @@ namespace search::memoryindex { /** - * Class used to store the {wordRef, fieldId, docId} tuples that are inserted - * into the memory index dictionary. These tuples are later used when removing - * all remains of a document from the posting lists of the dictionary. + * Class used to store the {wordRef, docId} tuples that are inserted into a FieldIndex and its posting lists. + * + * These tuples are later used when removing all remains of a document from the posting lists in that index. */ -class CompactDocumentWordsStore { +class CompactWordsStore { public: /** - * Builder used to collect all wordRefs for a field. + * Builder used to collect all words (as wordRefs) for a docId in a field. */ class Builder { public: @@ -37,7 +37,7 @@ public: }; /** - * Iterator over all {wordRef, fieldId} pairs for a document. + * Iterator over all words (as wordRefs) for a docId in a field. */ class Iterator { private: @@ -58,7 +58,7 @@ public: }; /** - * Store for all {wordRef, fieldId} pairs among all documents. + * Store for all unique words (as wordRefs) among all documents. */ class Store { public: @@ -74,7 +74,7 @@ public: Store(); ~Store(); datastore::EntryRef insert(const Builder &builder); - Iterator get(datastore::EntryRef ref) const; + Iterator get(datastore::EntryRef wordRef) const; MemoryUsage getMemoryUsage() const { return _store.getMemoryUsage(); } }; @@ -85,8 +85,8 @@ private: Store _wordsStore; public: - CompactDocumentWordsStore(); - ~CompactDocumentWordsStore(); + CompactWordsStore(); + ~CompactWordsStore(); void insert(const Builder &builder); void remove(uint32_t docId); Iterator get(uint32_t docId) const; diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index_remover.cpp b/searchlib/src/vespa/searchlib/memoryindex/field_index_remover.cpp index 1b9b7f8f752..2afddf072f2 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/field_index_remover.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/field_index_remover.cpp @@ -7,8 +7,8 @@ namespace search::memoryindex { -using Builder = CompactDocumentWordsStore::Builder; -using Iterator = CompactDocumentWordsStore::Iterator; +using Builder = CompactWordsStore::Builder; +using Iterator = CompactWordsStore::Iterator; FieldIndexRemover::FieldIndexRemover(const WordStore &wordStore) : _store(), diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index_remover.h b/searchlib/src/vespa/searchlib/memoryindex/field_index_remover.h index 44037c82c6a..19b3353a27a 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/field_index_remover.h +++ b/searchlib/src/vespa/searchlib/memoryindex/field_index_remover.h @@ -1,7 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include "compact_document_words_store.h" +#include "compact_words_store.h" #include "i_field_index_insert_listener.h" namespace search::memoryindex { @@ -42,8 +42,8 @@ private: }; }; - CompactDocumentWordsStore _store; - CompactDocumentWordsStore::Builder::UP _builder; + CompactWordsStore _store; + CompactWordsStore::Builder::UP _builder; std::vector<WordFieldDocTuple> _wordFieldDocTuples; const WordStore &_wordStore; @@ -51,8 +51,8 @@ public: FieldIndexRemover(const WordStore &wordStore); ~FieldIndexRemover(); void remove(uint32_t docId, IFieldIndexRemoveListener &inverter); - CompactDocumentWordsStore &getStore() { return _store; } - const CompactDocumentWordsStore &getStore() const { return _store; } + CompactWordsStore &getStore() { return _store; } + const CompactWordsStore &getStore() const { return _store; } // Implements IFieldIndexInsertListener void insert(datastore::EntryRef wordRef, uint32_t docId) override; |