Move datastore code from search::btree -> search::datastore.

7 files changed, 11 insertions, 8 deletions

diff --git a/searchlib/src/tests/memoryindex/btree/btree_test.cpp b/searchlib/src/tests/memoryindex/btree/btree_test.cpp
index 5fb6761ba57..deec982b5ab 100644
--- a/searchlib/src/tests/memoryindex/btree/btree_test.cpp
+++ b/searchlib/src/tests/memoryindex/btree/btree_test.cpp
@@ -21,6 +21,7 @@ LOG_SETUP("btree_test");
 #include <vespa/searchlib/btree/btreestore.hpp>
 
 using vespalib::GenerationHandler;
+using search::datastore::EntryRef;
 
 namespace search {
 namespace btree {
diff --git a/searchlib/src/tests/memoryindex/compact_document_words_store/compact_document_words_store_test.cpp b/searchlib/src/tests/memoryindex/compact_document_words_store/compact_document_words_store_test.cpp
index 736e24332d4..662adbf6b94 100644
--- a/searchlib/src/tests/memoryindex/compact_document_words_store/compact_document_words_store_test.cpp
+++ b/searchlib/src/tests/memoryindex/compact_document_words_store/compact_document_words_store_test.cpp
@@ -10,7 +10,7 @@ LOG_SETUP(".memoryindex.compact_document_words_store_test");
 #include <map>
 
 using namespace search;
-using namespace search::btree;
+using namespace search::datastore;
 using namespace search::memoryindex;
 
 typedef CompactDocumentWordsStore::Builder Builder;
diff --git a/searchlib/src/tests/memoryindex/datastore/datastore_test.cpp b/searchlib/src/tests/memoryindex/datastore/datastore_test.cpp
index d07634c426c..de673c8c0c9 100644
--- a/searchlib/src/tests/memoryindex/datastore/datastore_test.cpp
+++ b/searchlib/src/tests/memoryindex/datastore/datastore_test.cpp
@@ -7,7 +7,7 @@ LOG_SETUP("datastore_test");
 #include <vespa/searchlib/datastore/datastore.hpp>
 
 namespace search {
-namespace btree {
+namespace datastore {
 
 class MyStore : public DataStore<int, EntryRefT<3, 2> > {
 private:
@@ -428,5 +428,5 @@ Test::Main()
 }
 }
 
-TEST_APPHOOK(search::btree::Test);
+TEST_APPHOOK(search::datastore::Test);
 
diff --git a/searchlib/src/tests/memoryindex/datastore/featurestore_test.cpp b/searchlib/src/tests/memoryindex/datastore/featurestore_test.cpp
index 87d32c90b78..87a9ab87cb1 100644
--- a/searchlib/src/tests/memoryindex/datastore/featurestore_test.cpp
+++ b/searchlib/src/tests/memoryindex/datastore/featurestore_test.cpp
@@ -6,6 +6,7 @@ LOG_SETUP("featurestore_test");
 #include <vespa/searchlib/memoryindex/featurestore.h>
 
 using namespace search::btree;
+using namespace search::datastore;
 using namespace search::index;
 
 namespace search
diff --git a/searchlib/src/tests/memoryindex/datastore/wordstore_test.cpp b/searchlib/src/tests/memoryindex/datastore/wordstore_test.cpp
index 825992b3b4f..fcf96d5afe9 100644
--- a/searchlib/src/tests/memoryindex/datastore/wordstore_test.cpp
+++ b/searchlib/src/tests/memoryindex/datastore/wordstore_test.cpp
@@ -5,7 +5,7 @@ LOG_SETUP("wordstore_test");
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchlib/memoryindex/wordstore.h>
 
-using namespace search::btree;
+using namespace search::datastore;
 
 namespace search {
 namespace memoryindex {
diff --git a/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp b/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp
index ef8383b23c7..907e983420c 100644
--- a/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp
+++ b/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp
@@ -45,6 +45,7 @@ namespace search
 {
 
 using namespace btree;
+using namespace datastore;
 using namespace fef;
 using namespace index;
 using queryeval::SearchIterator;
@@ -510,7 +511,7 @@ public:
         return *this;
     }
 
-    btree::EntryRef
+    datastore::EntryRef
     getWordRef()
     {
         return _inserter.getWordRef();
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 8c6751adbeb..838e876d284 100644
--- a/searchlib/src/tests/memoryindex/document_remover/document_remover_test.cpp
+++ b/searchlib/src/tests/memoryindex/document_remover/document_remover_test.cpp
@@ -64,7 +64,7 @@ struct Fixture
 {
     MockRemoveListener _listener;
     std::vector<std::unique_ptr<WordStore>> _wordStores;
-    std::vector<std::map<vespalib::string, btree::EntryRef>> _wordToRefMaps;
+    std::vector<std::map<vespalib::string, datastore::EntryRef>> _wordToRefMaps;
     std::vector<std::unique_ptr<DocumentRemover>> _removers;
     Fixture()
         : _listener(),
@@ -80,12 +80,12 @@ struct Fixture
         }
         _wordToRefMaps.resize(numFields);
     }
-    btree::EntryRef getWordRef(const vespalib::string &word, uint32_t fieldId) {
+    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()) {
-            btree::EntryRef ref = wordStore.addWord(word);
+            datastore::EntryRef ref = wordStore.addWord(word);
             wordToRefMap[word] = ref;
             return ref;
         }