Ticket #392: modifiedpostlistdeletes.patch

xapian-core/tests/api_wrdb.cc

@@ -1958 +1958 @@
 
     return true;
 }
+
+/** Regression test for bug in ModifiedPostList iteration
+ */
+DEFINE_TESTCASE(modifiedpostlist1, writable) {
+    Xapian::WritableDatabase db = get_writable_database();
+    Xapian::Document a, b;
+    Xapian::Enquire enq(db);
+   
+    a.add_term("T");
+    enq.set_query(Xapian::Query("T"));
+   
+    db.replace_document(2, a);
+    db.commit();
+    db.replace_document(1, a);
+    db.replace_document(1, b);
+   
+    mset_expect_order(enq.get_mset(0, 2), 2);
+   
+    return true;
+}

xapian-core/backends/chert/chert_modifiedpostlist.cc

@@ -32 +32 @@
 ChertModifiedPostList::skip_deletes(Xapian::weight w_min)
 {
     while (!ChertPostList::at_end()) {
+        while (it != mods.end() && it->second.first == 'D' && it->first < ChertPostList::get_docid()) ++it;
         if (it == mods.end()) return;
         if (it->first != ChertPostList::get_docid()) return;
         if (it->second.first != 'D') return;
@@ -52 +53 @@
 {
     if (it == mods.end()) return ChertPostList::get_docid();
     if (ChertPostList::at_end()) return it->first;
+    Assert(it->second.first != 'D');
     return min(it->first, ChertPostList::get_docid());
 }
 

xapian-core/backends/flint/flint_modifiedpostlist.cc

@@ -32 +32 @@
 FlintModifiedPostList::skip_deletes(Xapian::weight w_min)
 {
     while (!FlintPostList::at_end()) {
+        while (it != mods.end() && it->second.first == 'D' && it->first < FlintPostList::get_docid()) ++it;
         if (it == mods.end()) return;
         if (it->first != FlintPostList::get_docid()) return;
         if (it->second.first != 'D') return;
@@ -52 +53 @@
 {
     if (it == mods.end()) return FlintPostList::get_docid();
     if (FlintPostList::at_end()) return it->first;
+    Assert(it->second.first != 'D');
     return min(it->first, FlintPostList::get_docid());
 }