Ticket #394: positional-query-weight-check-first-1.2.patch

matcher/selectpostlist.cc

@@ -34 +34 @@
         PostList *p = source->next(w_min);
         (void)p;
         Assert(p == NULL); // AND should never prune
-    } while (!source->at_end() && !test_doc());
+        wt = -1;
+    } while (!source->at_end() &&
+             (SelectPostList::get_weight() < w_min || !test_doc()));
     RETURN(NULL);
 }
 
@@ -46 +48 @@
         PostList *p = source->skip_to(did, w_min);
         (void)p;
         Assert(p == NULL); // AND should never prune
-        if (!source->at_end() && !test_doc())
+        wt = -1;
+        if (!source->at_end() &&
+            (SelectPostList::get_weight() < w_min || !test_doc()))
             RETURN(SelectPostList::next(w_min));
     }
     RETURN(NULL);
@@ -59 +63 @@
     PostList *p = source->check(did, w_min, valid);
     (void)p;
     Assert(p == NULL); // AND should never prune
-    if (valid && !source->at_end() && !test_doc())
+    wt = -1;
+    if (valid && !source->at_end() &&
+        (SelectPostList::get_weight() < w_min || !test_doc()))
         valid = false;
     RETURN(NULL);
 }

matcher/selectpostlist.h

@@ -35 +35 @@
 
     protected:
         PostList *source;
+        mutable double wt;
 
         /** Subclasses should override test_doc() with a method which returns
          *  true if a document meets the appropriate criterion, false in not
@@ -50 +51 @@
         Xapian::doccount get_termfreq_min() const { return 0; }
         Xapian::weight get_maxweight() const { return source->get_maxweight(); }
         Xapian::docid get_docid() const { return source->get_docid(); }
-        Xapian::weight get_weight() const { return source->get_weight(); }
+        Xapian::weight get_weight() const {
+            if (wt < 0.0)
+                wt = source->get_weight();
+            return wt;
+        }
         Xapian::termcount get_doclength() const { return source->get_doclength(); }
         Xapian::weight recalc_maxweight() { return source->recalc_maxweight(); }
         PositionList * read_position_list() { return source->read_position_list(); }
@@ -63 +68 @@
 
         std::string get_description() const;    
     
-        SelectPostList(PostList *source_) : source(source_) { }
+        SelectPostList(PostList *source_) : source(source_), wt(-1) { }
         ~SelectPostList() { delete source; }
 };