diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2020-05-04 11:37:01 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-05-04 11:37:01 +0200 |
commit | 12641f4383088dd087c1061739c5765393d2b129 (patch) | |
tree | 7ea647c0e6e646462feb50c46eb0a42d80b20515 /searchlib/src/tests/memoryindex | |
parent | 44d195021c1742fdbddfcb6f9afac7fdd993a96a (diff) |
Rename namespace search::btree to vespalib::btree.
Rename namespace search::datastore to vespalib::datastore.
Diffstat (limited to 'searchlib/src/tests/memoryindex')
5 files changed, 9 insertions, 9 deletions
diff --git a/searchlib/src/tests/memoryindex/compact_words_store/compact_words_store_test.cpp b/searchlib/src/tests/memoryindex/compact_words_store/compact_words_store_test.cpp index 52c85a70160..6f2e52f7a4f 100644 --- a/searchlib/src/tests/memoryindex/compact_words_store/compact_words_store_test.cpp +++ b/searchlib/src/tests/memoryindex/compact_words_store/compact_words_store_test.cpp @@ -9,7 +9,7 @@ #include <map> using namespace search; -using namespace search::datastore; +using namespace vespalib::datastore; using namespace search::memoryindex; using vespalib::MemoryUsage; diff --git a/searchlib/src/tests/memoryindex/datastore/feature_store_test.cpp b/searchlib/src/tests/memoryindex/datastore/feature_store_test.cpp index c6368bee6eb..1eb9890cf2e 100644 --- a/searchlib/src/tests/memoryindex/datastore/feature_store_test.cpp +++ b/searchlib/src/tests/memoryindex/datastore/feature_store_test.cpp @@ -6,8 +6,8 @@ #include <vespa/log/log.h> LOG_SETUP("feature_store_test"); -using namespace search::btree; -using namespace search::datastore; +using namespace vespalib::btree; +using namespace vespalib::datastore; using namespace search::index; using search::index::schema::CollectionType; diff --git a/searchlib/src/tests/memoryindex/datastore/word_store_test.cpp b/searchlib/src/tests/memoryindex/datastore/word_store_test.cpp index 86365287b29..9ab5cc685e2 100644 --- a/searchlib/src/tests/memoryindex/datastore/word_store_test.cpp +++ b/searchlib/src/tests/memoryindex/datastore/word_store_test.cpp @@ -5,7 +5,7 @@ #include <vespa/log/log.h> LOG_SETUP("word_store_test"); -using namespace search::datastore; +using namespace vespalib::datastore; namespace search::memoryindex { 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 9347e99f6c2..ee42d68a495 100644 --- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp +++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp @@ -25,8 +25,8 @@ #include <vespa/log/log.h> LOG_SETUP("field_index_test"); -using namespace search::btree; -using namespace search::datastore; +using namespace vespalib::btree; +using namespace vespalib::datastore; namespace search { diff --git a/searchlib/src/tests/memoryindex/field_index_remover/field_index_remover_test.cpp b/searchlib/src/tests/memoryindex/field_index_remover/field_index_remover_test.cpp index f11df42f6b1..af7ea9be481 100644 --- a/searchlib/src/tests/memoryindex/field_index_remover/field_index_remover_test.cpp +++ b/searchlib/src/tests/memoryindex/field_index_remover/field_index_remover_test.cpp @@ -60,7 +60,7 @@ struct MockRemoveListener : public IFieldIndexRemoveListener { struct FieldIndexRemoverTest : public ::testing::Test { MockRemoveListener _listener; std::vector<std::unique_ptr<WordStore>> _wordStores; - std::vector<std::map<vespalib::string, datastore::EntryRef>> _wordToRefMaps; + std::vector<std::map<vespalib::string, vespalib::datastore::EntryRef>> _wordToRefMaps; std::vector<std::unique_ptr<FieldIndexRemover>> _removers; FieldIndexRemoverTest() @@ -77,12 +77,12 @@ struct FieldIndexRemoverTest : public ::testing::Test { } _wordToRefMaps.resize(numFields); } - datastore::EntryRef getWordRef(const vespalib::string &word, uint32_t fieldId) { + vespalib::datastore::EntryRef getWordRef(const vespalib::string &word, uint32_t fieldId) { auto &wordToRefMap = _wordToRefMaps[fieldId]; WordStore &wordStore = *_wordStores[fieldId]; auto itr = wordToRefMap.find(word); if (itr == wordToRefMap.end()) { - datastore::EntryRef ref = wordStore.addWord(word); + vespalib::datastore::EntryRef ref = wordStore.addWord(word); wordToRefMap[word] = ref; return ref; } |