Merge pull request #16690 from vespa-engine/geirst/refactor-datastore-classes

Refactor datastore classes

8 files changed, 8 insertions, 8 deletions

diff --git a/searchlib/src/tests/attribute/postinglist/postinglist.cpp b/searchlib/src/tests/attribute/postinglist/postinglist.cpp
index 751fa72c349..d5bcad56495 100644
--- a/searchlib/src/tests/attribute/postinglist/postinglist.cpp
+++ b/searchlib/src/tests/attribute/postinglist/postinglist.cpp
@@ -597,7 +597,7 @@ AttributePostingListTest::doCompactEnumStore(Tree &tree,
             // Freelists already disabled due to variable sized data
         }
     }
-    valueHandle.switchActiveBuffer(0, 0u);
+    valueHandle.switch_primary_buffer(0, 0u);
 
     for (; i.valid(); ++i)
     {
diff --git a/searchlib/src/vespa/searchlib/attribute/postingstore.cpp b/searchlib/src/vespa/searchlib/attribute/postingstore.cpp
index cbe2233dedc..0473a7b2915 100644
--- a/searchlib/src/vespa/searchlib/attribute/postingstore.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/postingstore.cpp
@@ -70,7 +70,7 @@ PostingStore<DataT>::PostingStore(EnumPostingTree &dict, Status &status,
 {
     // TODO: Add type for bitvector
     _store.addType(&_bvType);
-    _store.initActiveBuffers();
+    _store.init_primary_buffers();
     _store.enableFreeLists();
 }
 
diff --git a/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.cpp b/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.cpp
index ef5c2ea6773..1cda712dd86 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.cpp
@@ -98,7 +98,7 @@ CompactWordsStore::Store::Store()
       _typeId(0)
 {
     _store.addType(&_type);
-    _store.initActiveBuffers();
+    _store.init_primary_buffers();
 }
 
 CompactWordsStore::Store::~Store()
diff --git a/searchlib/src/vespa/searchlib/memoryindex/feature_store.cpp b/searchlib/src/vespa/searchlib/memoryindex/feature_store.cpp
index 73c26ef3fbd..1a24615fdf0 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/feature_store.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/feature_store.cpp
@@ -88,7 +88,7 @@ FeatureStore::FeatureStore(const Schema &schema)
         _fieldsParams[it.getIndex()].setSchemaParams(_schema, it.getIndex());
     }
     _store.addType(&_type);
-    _store.initActiveBuffers();
+    _store.init_primary_buffers();
 }
 
 FeatureStore::~FeatureStore()
diff --git a/searchlib/src/vespa/searchlib/memoryindex/word_store.cpp b/searchlib/src/vespa/searchlib/memoryindex/word_store.cpp
index 1e644ce2533..e22ce88ebbf 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/word_store.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/word_store.cpp
@@ -16,7 +16,7 @@ WordStore::WordStore()
       _typeId(0)
 {
     _store.addType(&_type);
-    _store.initActiveBuffers();
+    _store.init_primary_buffers();
 }
 
 
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp
index 5c16199dffd..28c82cb7a97 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp
@@ -26,7 +26,7 @@ PredicateIntervalStore::PredicateIntervalStore()
     // This order determines type ids.
     _store.addType(&_size1Type);
 
-    _store.initActiveBuffers();
+    _store.init_primary_buffers();
 }
 
 PredicateIntervalStore::~PredicateIntervalStore() {
diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp
index 36a803aa806..e99ba196224 100644
--- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp
@@ -77,7 +77,7 @@ DenseTensorStore::DenseTensorStore(const ValueType &type, std::unique_ptr<vespal
 {
     _emptySpace.resize(getBufSize(), 0);
     _store.addType(&_bufferType);
-    _store.initActiveBuffers();
+    _store.init_primary_buffers();
     _store.enableFreeLists();
 }
 
diff --git a/searchlib/src/vespa/searchlib/tensor/serialized_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/serialized_tensor_store.cpp
index 7045c82935c..f55b51875b2 100644
--- a/searchlib/src/vespa/searchlib/tensor/serialized_tensor_store.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/serialized_tensor_store.cpp
@@ -23,7 +23,7 @@ SerializedTensorStore::SerializedTensorStore()
                   RefType::offsetSize() / RefType::align(1))
 {
     _store.addType(&_bufferType);
-    _store.initActiveBuffers();
+    _store.init_primary_buffers();
 }
 
 SerializedTensorStore::~SerializedTensorStore()