- Use a rwlock as reading surpasses writing by a very large factor.

- size() does not need a lock.

2 files changed, 5 insertions, 4 deletions

diff --git a/searchlib/src/tests/attribute/bitvector_search_cache/bitvector_search_cache_test.cpp b/searchlib/src/tests/attribute/bitvector_search_cache/bitvector_search_cache_test.cpp
index b9c82892a97..bb65beed68b 100644
--- a/searchlib/src/tests/attribute/bitvector_search_cache/bitvector_search_cache_test.cpp
+++ b/searchlib/src/tests/attribute/bitvector_search_cache/bitvector_search_cache_test.cpp
@@ -9,8 +9,9 @@ using namespace search::attribute;
 
 using BitVectorSP = BitVectorSearchCache::BitVectorSP;
 using Entry = BitVectorSearchCache::Entry;
+using EntrySP = std::shared_ptr<Entry>;
 
-Entry::SP
+EntrySP
 makeEntry()
 {
     return std::make_shared<Entry>(IDocumentMetaStoreContext::IReadGuard::SP(), BitVector::create(5), 10);
@@ -18,8 +19,8 @@ makeEntry()
 
 struct Fixture {
     BitVectorSearchCache cache;
-    Entry::SP entry1;
-    Entry::SP entry2;
+    EntrySP entry1;
+    EntrySP entry2;
     Fixture()
         : cache(),
           entry1(makeEntry()),
diff --git a/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp b/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp
index 311d3ef71e7..61e66d384e1 100644
--- a/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp
+++ b/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp
@@ -467,7 +467,7 @@ struct SearchCacheFixture : Fixture {
 
 SearchCacheFixture::~SearchCacheFixture() = default;
 
-BitVectorSearchCache::Entry::SP
+std::shared_ptr<BitVectorSearchCache::Entry>
 makeSearchCacheEntry(const std::vector<uint32_t> docIds, uint32_t docIdLimit)
 {
     std::shared_ptr<BitVector> bitVector = BitVector::create(docIdLimit);