Ticket #464: bug-464-fix.patch

matcher/multimatch.cc

@@ -318 +318 @@
 {
     DEBUGCALL(MATCH, void, "MultiMatch::get_mset", first << ", " << maxitems
               << ", " << check_at_least << ", ...");
-    if (check_at_least < maxitems) check_at_least = maxitems;
+    {
+        Xapian::doccount docs = db.get_doccount();
+        maxitems = min(maxitems, docs);
+        check_at_least = min(check_at_least, docs);
+        check_at_least = max(check_at_least, maxitems);
+    }
 
     if (!query) {
         mset = Xapian::MSet(); // FIXME: mset.get_firstitem() will return 0 not first
@@ -893 +898 @@
             = items.size();
         if (collapser && matches_lower_bound > uncollapsed_lower_bound)
             uncollapsed_lower_bound = matches_lower_bound;
-    } else if (docs_matched < check_at_least) {
+    } else if (docs_matched + collapser.get_dups_ignored() < check_at_least) {
         // We have seen fewer matches than we checked for, so we must have seen
         // all the matches.
         LOGLINE(MATCH, "Setting bounds equal");