Rename namespace search::btree to vespalib::btree.

Rename namespace search::datastore to vespalib::datastore.

5 files changed, 12 insertions, 12 deletions

diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp
index 5b6f7ca9a30..3f088a497aa 100644
--- a/searchcore/src/tests/proton/index/indexmanager_test.cpp
+++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp
@@ -36,7 +36,7 @@ using search::SerialNum;
 using search::TuneFileAttributes;
 using search::TuneFileIndexManager;
 using search::TuneFileIndexing;
-using search::datastore::EntryRef;
+using vespalib::datastore::EntryRef;
 using search::index::DocBuilder;
 using search::index::DummyFileHeaderContext;
 using search::index::FieldLengthInfo;
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
index b43efa41d0b..96f69179482 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
@@ -36,7 +36,7 @@ using search::IAttributeSaveTarget;
 using search::LidUsageStats;
 using search::attribute::LoadUtils;
 using search::attribute::SearchContextParams;
-using search::btree::BTreeNoLeafData;
+using vespalib::btree::BTreeNoLeafData;
 using search::fef::TermFieldMatchData;
 using search::queryeval::Blueprint;
 using search::queryeval::SearchIterator;
@@ -1095,7 +1095,7 @@ DocumentMetaStore::foreach(const search::IGidToLidMapperVisitor &visitor) const
 
 }  // namespace proton
 
-namespace search::btree {
+namespace vespalib::btree {
 
 template class BTreeIteratorBase<proton::DocumentMetaStore::DocId, BTreeNoLeafData, NoAggregated, BTreeDefaultTraits::INTERNAL_SLOTS, BTreeDefaultTraits::LEAF_SLOTS, BTreeDefaultTraits::PATH_SIZE>;
 
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
index 57f3458157e..ba462fb070b 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
@@ -63,8 +63,8 @@ private:
     // Lids are stored as keys in the tree, sorted by their gid
     // counterpart.  The LidGidKeyComparator class maps from lids -> metadata by
     // using the metadata store.
-    typedef search::btree::BTree<DocId, search::btree::BTreeNoLeafData,
-                                 search::btree::NoAggregated, const KeyComp &> TreeType;
+    typedef vespalib::btree::BTree<DocId, vespalib::btree::BTreeNoLeafData,
+                                 vespalib::btree::NoAggregated, const KeyComp &> TreeType;
 
     MetaDataStore       _metaDataStore;
     TreeType            _gidToLidMap;
@@ -273,7 +273,7 @@ public:
 
 }
 
-namespace search::btree {
+namespace vespalib::btree {
 
 extern template class BTreeIteratorBase<proton::DocumentMetaStore::DocId, BTreeNoLeafData, NoAggregated, BTreeDefaultTraits::INTERNAL_SLOTS, BTreeDefaultTraits::LEAF_SLOTS, BTreeDefaultTraits::PATH_SIZE>;
 
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.h
index e0a808692ad..e8a6a7929f0 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.h
@@ -20,10 +20,10 @@ class DocumentMetaStoreSaver : public search::AttributeSaver
 public:
     using KeyComp = documentmetastore::LidGidKeyComparator;
     using DocId = documentmetastore::IStore::DocId;
-    using GidIterator = search::btree::BTreeConstIterator<
+    using GidIterator = vespalib::btree::BTreeConstIterator<
         DocId,
-        search::btree::BTreeNoLeafData,
-        search::btree::NoAggregated,
+        vespalib::btree::BTreeNoLeafData,
+        vespalib::btree::NoAggregated,
         const KeyComp &>;
     using MetaDataStore = vespalib::RcuVectorBase<RawDocumentMetaData>;
 
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store.h
index b4e849bd53f..b757d2efb6a 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store.h
@@ -34,9 +34,9 @@ struct IDocumentMetaStore : public search::IDocumentMetaStore,
     // Lids are stored as keys in the tree, sorted by their gid counterpart.
     // The LidGidKeyComparator class maps from lids -> metadata by using the metadata store.
     // TODO(geirst): move this typedef and iterator functions away from this interface.
-    typedef search::btree::BTree<DocId,
-            search::btree::BTreeNoLeafData,
-            search::btree::NoAggregated,
+    typedef vespalib::btree::BTree<DocId,
+            vespalib::btree::BTreeNoLeafData,
+            vespalib::btree::NoAggregated,
             const documentmetastore::LidGidKeyComparator &> TreeType;
     typedef TreeType::Iterator Iterator;
     typedef std::shared_ptr<IDocumentMetaStore> SP;