Merge pull request #22725 from vespa-engine/balder/reduce-inclusion-of-rcuvector-hpp

Reduce inclusion of rcuvector.hpp

14 files changed, 7 insertions, 19 deletions

diff --git a/searchlib/src/tests/predicate/simple_index_test.cpp b/searchlib/src/tests/predicate/simple_index_test.cpp
index c89987eea7d..dfa8c12deec 100644
--- a/searchlib/src/tests/predicate/simple_index_test.cpp
+++ b/searchlib/src/tests/predicate/simple_index_test.cpp
@@ -10,6 +10,7 @@
 #include <vespa/vespalib/btree/btreestore.hpp>
 #include <vespa/vespalib/btree/btreenodeallocator.hpp>
 #include <vespa/vespalib/datastore/buffer_type.hpp>
+#include <vespa/vespalib/util/rcuvector.hpp>
 #include <map>
 
 #include <vespa/log/log.h>
diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.cpp b/searchlib/src/vespa/searchlib/attribute/enumstore.cpp
index 31523012c1a..d7d627ff2bc 100644
--- a/searchlib/src/vespa/searchlib/attribute/enumstore.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/enumstore.cpp
@@ -2,7 +2,6 @@
 
 #include "enumstore.hpp"
 #include <vespa/vespalib/datastore/sharded_hash_map.h>
-#include <vespa/vespalib/util/rcuvector.hpp>
 #include <iomanip>
 
 #include <vespa/log/log.h>
@@ -89,7 +88,3 @@ template class EnumStoreT<float>;
 template class EnumStoreT<double>;
 
 } // namespace search
-
-namespace vespalib {
-    template class RcuVectorBase<search::IEnumStore::Index>;
-}
diff --git a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp
index 2a0fb24d70f..d5b50b591df 100644
--- a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp
@@ -4,7 +4,6 @@
 
 #include "multi_value_mapping.h"
 #include <vespa/vespalib/datastore/array_store.hpp>
-#include <vespa/vespalib/util/rcuvector.hpp>
 
 namespace search::attribute {
 
diff --git a/searchlib/src/vespa/searchlib/attribute/reference_mappings.cpp b/searchlib/src/vespa/searchlib/attribute/reference_mappings.cpp
index 6ebc2996408..fe61913b801 100644
--- a/searchlib/src/vespa/searchlib/attribute/reference_mappings.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/reference_mappings.cpp
@@ -17,9 +17,7 @@ ReferenceMappings::ReferenceMappings(GenerationHolder &genHolder, const std::ato
 {
 }
 
-ReferenceMappings::~ReferenceMappings()
-{
-}
+ReferenceMappings::~ReferenceMappings() = default;
 
 void
 ReferenceMappings::clearMapping(const Reference &entry)
diff --git a/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp b/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
index 04cb687e366..3c47a5592bc 100644
--- a/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
@@ -9,7 +9,6 @@
 #include <vespa/vespalib/util/benchmark_timer.h>
 #include <vespa/vespalib/util/cpu_usage.h>
 #include <vespa/vespalib/util/exceptions.h>
-#include <vespa/vespalib/util/rcuvector.hpp>
 #include <vespa/vespalib/util/size_literals.h>
 #include <thread>
 
diff --git a/searchlib/src/vespa/searchlib/predicate/simple_index.hpp b/searchlib/src/vespa/searchlib/predicate/simple_index.hpp
index 3373b6f5ca7..cb37fec26ea 100644
--- a/searchlib/src/vespa/searchlib/predicate/simple_index.hpp
+++ b/searchlib/src/vespa/searchlib/predicate/simple_index.hpp
@@ -3,7 +3,6 @@
 
 #include "simple_index.h"
 #include <vespa/vespalib/util/stringfmt.h>
-#include <vespa/vespalib/util/rcuvector.hpp>
 
 namespace search::predicate {
 
diff --git a/searchlib/src/vespa/searchlib/tensor/hnsw_graph.cpp b/searchlib/src/vespa/searchlib/tensor/hnsw_graph.cpp
index 427e6700e8c..56af2ed3b35 100644
--- a/searchlib/src/vespa/searchlib/tensor/hnsw_graph.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/hnsw_graph.cpp
@@ -3,7 +3,6 @@
 #include "hnsw_graph.h"
 #include "hnsw_index.h"
 #include <vespa/vespalib/datastore/array_store.hpp>
-#include <vespa/vespalib/util/rcuvector.hpp>
 
 namespace search::tensor {
 
diff --git a/searchlib/src/vespa/searchlib/tensor/hnsw_graph.h b/searchlib/src/vespa/searchlib/tensor/hnsw_graph.h
index 06482c075cb..9e3850bd470 100644
--- a/searchlib/src/vespa/searchlib/tensor/hnsw_graph.h
+++ b/searchlib/src/vespa/searchlib/tensor/hnsw_graph.h
@@ -31,7 +31,6 @@ struct HnswGraph {
     // This stores the level arrays for all nodes.
     // Each node consists of an array of levels (from level 0 to n) where each entry is a reference to the link array at that level.
     using NodeStore = vespalib::datastore::ArrayStore<AtomicEntryRef, LevelArrayEntryRefType>;
-    using StoreConfig = vespalib::datastore::ArrayStoreConfig;
     using LevelArrayRef = NodeStore::ConstArrayRef;
 
     // This stores all link arrays.
diff --git a/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp b/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp
index 0e09118a3f3..24bfacb8c5a 100644
--- a/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp
@@ -7,7 +7,6 @@
 #include "hnsw_index_loader.hpp"
 #include "hnsw_index_saver.h"
 #include "random_level_generator.h"
-#include "reusable_set_visited_tracker.h"
 #include <vespa/searchlib/attribute/address_space_components.h>
 #include <vespa/searchlib/attribute/address_space_usage.h>
 #include <vespa/searchlib/util/fileutil.h>
@@ -17,7 +16,6 @@
 #include <vespa/vespalib/datastore/array_store.hpp>
 #include <vespa/vespalib/datastore/compaction_strategy.h>
 #include <vespa/vespalib/util/memory_allocator.h>
-#include <vespa/vespalib/util/rcuvector.hpp>
 #include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/util/time.h>
 #include <vespa/log/log.h>
diff --git a/searchlib/src/vespa/searchlib/tensor/hnsw_index.h b/searchlib/src/vespa/searchlib/tensor/hnsw_index.h
index 48f4cb9d494..72a10724ff1 100644
--- a/searchlib/src/vespa/searchlib/tensor/hnsw_index.h
+++ b/searchlib/src/vespa/searchlib/tensor/hnsw_index.h
@@ -15,7 +15,6 @@
 #include <vespa/vespalib/datastore/atomic_entry_ref.h>
 #include <vespa/vespalib/datastore/compaction_spec.h>
 #include <vespa/vespalib/datastore/entryref.h>
-#include <vespa/vespalib/util/rcuvector.h>
 #include <vespa/vespalib/util/reusable_set_pool.h>
 #include <vespa/vespalib/stllike/allocator.h>
 
diff --git a/searchlib/src/vespa/searchlib/tensor/serialized_fast_value_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/serialized_fast_value_attribute.cpp
index 87537298d1f..295a8aeaefc 100644
--- a/searchlib/src/vespa/searchlib/tensor/serialized_fast_value_attribute.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/serialized_fast_value_attribute.cpp
@@ -4,7 +4,6 @@
 #include "streamed_value_saver.h"
 #include <vespa/eval/eval/value.h>
 #include <vespa/fastlib/io/bufferedfile.h>
-#include <vespa/vespalib/util/rcuvector.hpp>
 #include <vespa/log/log.h>
 
 LOG_SETUP(".searchlib.tensor.serialized_fast_value_attribute");
diff --git a/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp
index dabf9203551..e000afedadc 100644
--- a/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp
@@ -7,7 +7,6 @@
 #include <vespa/searchlib/util/state_explorer_utils.h>
 #include <vespa/vespalib/data/slime/cursor.h>
 #include <vespa/vespalib/data/slime/inserter.h>
-#include <vespa/vespalib/util/rcuvector.hpp>
 #include <vespa/vespalib/util/shared_string_repo.h>
 #include <vespa/eval/eval/fast_value.h>
 #include <vespa/eval/eval/value_codec.h>
diff --git a/vespalib/src/vespa/vespalib/datastore/datastore.cpp b/vespalib/src/vespa/vespalib/datastore/datastore.cpp
index 1c68b79453e..c0f5c122283 100644
--- a/vespalib/src/vespa/vespalib/datastore/datastore.cpp
+++ b/vespalib/src/vespa/vespalib/datastore/datastore.cpp
@@ -14,4 +14,5 @@ template class DataStoreT<EntryRefT<22> >;
 template void vespalib::Array<vespalib::datastore::DataStoreBase::ElemHold1ListElem>::increase(size_t);
 template class vespalib::RcuVector<vespalib::datastore::EntryRef>;
 template class vespalib::RcuVectorBase<vespalib::datastore::EntryRef>;
-//template void vespalib::RcuVectorBase<vespalib::datastore::EntryRef>::expandAndInsert(const vespalib::datastore::EntryRef &);
+template class vespalib::RcuVector<vespalib::datastore::AtomicEntryRef>;
+template class vespalib::RcuVectorBase<vespalib::datastore::AtomicEntryRef>;
diff --git a/vespalib/src/vespa/vespalib/util/rcuvector.cpp b/vespalib/src/vespa/vespalib/util/rcuvector.cpp
index e75836218e6..ec8c2d4d244 100644
--- a/vespalib/src/vespa/vespalib/util/rcuvector.cpp
+++ b/vespalib/src/vespa/vespalib/util/rcuvector.cpp
@@ -7,6 +7,7 @@ namespace vespalib {
 template class RcuVectorBase<uint8_t>;
 template class RcuVectorBase<uint16_t>;
 template class RcuVectorBase<uint32_t>;
+template class RcuVectorBase<uint64_t>;
 template class RcuVectorBase<int8_t>;
 template class RcuVectorBase<int16_t>;
 template class RcuVectorBase<int32_t>;
@@ -17,6 +18,7 @@ template class RcuVectorBase<double>;
 template class RcuVector<uint8_t>;
 template class RcuVector<uint16_t>;
 template class RcuVector<uint32_t>;
+template class RcuVector<uint64_t>;
 template class RcuVector<int8_t>;
 template class RcuVector<int16_t>;
 template class RcuVector<int32_t>;
@@ -27,6 +29,7 @@ template class RcuVector<double>;
 template class RcuVectorHeld<uint8_t>;
 template class RcuVectorHeld<uint16_t>;
 template class RcuVectorHeld<uint32_t>;
+template class RcuVectorHeld<uint64_t>;
 template class RcuVectorHeld<int8_t>;
 template class RcuVectorHeld<int16_t>;
 template class RcuVectorHeld<int32_t>;