Keep a document meta store read guard together with bitvector posting list in search cache for imported attributes.

This is to ensure that no lids that are cached in the bitvector are re-used until the guard is released.

1 files changed, 7 insertions, 2 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/bitvector_search_cache.h b/searchlib/src/vespa/searchlib/attribute/bitvector_search_cache.h
index 73fb95e1752..a889120f8df 100644
--- a/searchlib/src/vespa/searchlib/attribute/bitvector_search_cache.h
+++ b/searchlib/src/vespa/searchlib/attribute/bitvector_search_cache.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <vespa/searchlib/common/i_document_meta_store_context.h>
 #include <vespa/vespalib/stllike/hash_map.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <memory>
@@ -21,13 +22,17 @@ namespace attribute {
 class BitVectorSearchCache {
 public:
     using BitVectorSP = std::shared_ptr<BitVector>;
+    using ReadGuardUP = IDocumentMetaStoreContext::IReadGuard::UP;
 
     struct Entry {
         using SP = std::shared_ptr<Entry>;
+        // We need to keep a document meta store read guard to ensure that no lids that are cached
+        // in the bit vector are re-used until the guard is released.
+        ReadGuardUP dmsReadGuard;
         BitVectorSP bitVector;
         uint32_t docIdLimit;
-        Entry(BitVectorSP bitVector_, uint32_t docIdLimit_)
-            : bitVector(std::move(bitVector_)), docIdLimit(docIdLimit_) {}
+        Entry(ReadGuardUP dmsReadGuard_, BitVectorSP bitVector_, uint32_t docIdLimit_)
+            : dmsReadGuard(std::move(dmsReadGuard_)), bitVector(std::move(bitVector_)), docIdLimit(docIdLimit_) {}
     };
 
 private: