make inverted index read docs from custom snapshot

arangodb · Dronplane · Feb 17, 2023 · Jan 24, 2023 · Jan 27, 2023 · Feb 6, 2023
commit cc68456ec9d5516e56fe437132c80e42903fe8f8
diff --git a/arangod/IResearch/IResearchDataStore.h b/arangod/IResearch/IResearchDataStore.h
@@ -133,6 +133,10 @@ class IResearchDataStore {
       return _snapshot->_reader;
     }
 
+    [[nodiscard]] auto const& getSnapshot() const noexcept {
+      return _snapshot->_snapshot;
+    }
+
    private:
     // lock preventing data store deallocation
     LinkLock _lock;

diff --git a/arangod/IResearch/IResearchInvertedIndex.cpp b/arangod/IResearch/IResearchInvertedIndex.cpp
@@ -39,6 +39,7 @@
 #include "IResearch/IResearchMetricStats.h"
 #include "IResearch/IResearchReadUtils.h"
 #include "Logger/LogMacros.h"
+#include "StorageEngine/PhysicalCollection.h"
 #include "Transaction/Methods.h"
 
 #include "analysis/token_
8000
attributes.hpp"
@@ -285,6 +286,7 @@ class IResearchInvertedIndexIteratorBase : public IndexIterator {
                                      int mutableConditionIdx)
       : IndexIterator(collection, trx, ReadOwnWrites::no),
         _reader(&state->snapshot.getDirectoryReader()),
+        _snapshot(*state->snapshot.getSnapshot().get()),
         _immutablePartCache(&state->immutablePartCache),
         _indexMeta(meta),
         _variable(variable),
@@ -449,6 +451,7 @@ class IResearchInvertedIndexIteratorBase : public IndexIterator {
 
   irs::filter::prepared::ptr _filter;
   irs::IndexReader const* _reader;
+  StorageSnapshot const& _snapshot;
   IResearchSnapshotState::ImmutablePartCache* _immutablePartCache;
   IResearchInvertedIndexMeta const* _indexMeta;
   aql::Variable const* _variable;
@@ -487,6 +490,18 @@ class IResearchInvertedIndexIterator final
     nextImplInternal<decltype(skipped), false, false>(skipped, count);
   }
 
+  bool nextDocumentImpl(DocumentCallback const& cb,
+                                       uint64_t limit) override {
+    return nextImpl(
+        [this, &cb](LocalDocumentId const& token) {
+          return _collection->getPhysical()
+              ->readFromSnapshot(_trx, token, cb, canReadOwnWrites(), _snapshot)
+              .ok();
+        },
+        limit);
+  }
+
+
   // FIXME: Evaluate buffering iresearch reads
   template<typename Callback, bool withCovering, bool produce>
   bool nextImplInternal(Callback const& callback, uint64_t limit) {