arangodb
diff --git a/‎3rdParty/iresearch/core/search/disjunction.hpp
Lines changed: 4 additions & 0 deletions b/‎3rdParty/iresearch/core/search/disjunction.hpp
Lines changed: 4 additions & 0 deletions
diff --git a/‎CHANGELOG
Lines changed: 3 additions & 0 deletions b/‎CHANGELOG
Lines changed: 3 additions & 0 deletions
diff --git a/‎tests/js/common/aql/aql-view-arangosearch-noncluster.js
Lines changed: 48 additions & 0 deletions b/‎tests/js/common/aql/aql-view-arangosearch-noncluster.js
Lines changed: 48 additions & 0 deletions
@@ -766,6 +766,9 @@ class disjunction final
   virtual void visit(void* ctx, bool (*visitor)(void*, Adapter&)) override {
     assert(ctx);
     assert(visitor);
+    if (heap_.empty()) {
+      return;
+    }
     hitch_all_iterators();
     auto& lead = itrs_[heap_.back()];
     auto cont = visitor(ctx, lead);
@@ -908,6 +911,7 @@ class disjunction final
   }
 
   std::pair<heap_iterator, heap_iterator> hitch_all_iterators() {
+    assert(!heap_.empty());
     // hitch all iterators in head to the lead (current doc_)
     auto begin = heap_.begin(), end = heap_.end()-1;
 
 
@@ -1,6 +1,9 @@
 v3.8.0-rc.2 (2021-06-07)
 ------------------------
 
+* Fix DEVSUP-753: now it is safe to call visit on exhausted disjunction
+  iterator.
+
 * Added check to utils/generateAllMetricsDocumentation.py to check that the file
   name and the value of the name attribute are the same in the metrics
   documentation snippets. Correct a few such names.
 
@@ -2567,7 +2567,55 @@ function iResearchAqlTestSuite () {
         db._dropView(queryView);
         analyzers.remove(queryAnalyzer, true);
       }
+    },
+    
+    testDisjunctionVisit : function() {
+      let queryColl = "DisjunctionCollection";
+      let queryView = "DisjunctionView";
+      try {
+        db._drop(queryColl);
+        db._dropView(queryView);
+        let coll = db._create(queryColl);
+        let view = db._createView(queryView, "arangosearch", { 
+              links: { 
+                  [queryColl] : { 
+                      fields: {
+                        value: { analyzers:['identity', 'text_en'] }
+                      }
+                  }
+              }
+        });
+        let documents = [
+          {"value":"test"},
+          // these docs will make STARTS_WITH more "costly" than PHRASE and conjunction will use PHRASE as lead! 
+          {"value":"test1234"},
+          {"value":"test21321312312"},
+          {"value":"test213213123122"},
+          {"value":"test2132131231222"},
+          {"value":"test21321312312222"},
+          {"value":"test2132131231222322"},
+          {"value":"test2132131231231231222322"},
+          // this will make PHRASE iterator not use small_disjunction (more than 5 candidates for LEVENSHTEIN)
+          {"value":"rest"},
+          {"value":"arest"},
+          {"value":"brest"},
+          {"value":"zest"},
+          {"value":"qest"}];
+        db[queryColl].save(documents);
+        let res = db._query("FOR d IN " + queryView +" SEARCH "
+                  + " (ANALYZER(PHRASE(d.value, {LEVENSHTEIN_MATCH : ['test', 2, true]}), 'text_en') "
+                  + " && ANALYZER(STARTS_WITH(d.value, 'test'),'text_en')) OR "
+                  + " BOOST(PHRASE(d.value, 'test144', 'identity'), 10) "
+                  + " OPTIONS {waitForSync:true} SORT BM25(d) DESC LIMIT 20 "
+                  + " RETURN {'Score':BM25(d), 'Id' : d.value, 'Entity' : d }").toArray();
+        assertEqual(1, res.length);
+        
+      } finally {
+        db._drop(queryColl);
+        db._dropView(queryView);
+      }
     }
+    
   };
 }