Ticket #674: remote-sort-key.patch

xapian-core/api/postlist.cc

@@ -47 +47 @@
 }
 
 const string *
+PostingIterator::Internal::get_sort_key() const
+{
+    return NULL;
+}
+
+const string *
 PostingIterator::Internal::get_collapse_key() const
 {
     return NULL;

xapian-core/api/postlist.h

@@ -95 +95 @@
     /// Return the weight contribution for the current position.
     virtual double get_weight() const = 0;
 
+    virtual const std::string * get_sort_key() const;
+
     /** If the collapse key is already known, return it.
      *
      *  This is implemented by MSetPostList (and MergePostList).  Other

xapian-core/matcher/mergepostlist.cc

@@ -151 +151 @@
 }
 
 const string *
+MergePostList::get_sort_key() const
+{
+    LOGCALL(MATCH, const string *, "MergePostList::get_sort_key", NO_ARGS);
+    Assert(current != -1);
+    RETURN(plists[current]->get_sort_key());
+}
+
+const string *
 MergePostList::get_collapse_key() const
 {
     LOGCALL(MATCH, const string *, "MergePostList::get_collapse_key", NO_ARGS);

xapian-core/matcher/mergepostlist.h

@@ -68 +68 @@
 
         Xapian::docid  get_docid() const;
         double get_weight() const;
+        const string * get_sort_key() const;
         const string * get_collapse_key() const;
 
         double get_maxweight() const;

xapian-core/matcher/msetpostlist.cc

@@ -83 +83 @@
 }
 
 const string *
+MSetPostList::get_sort_key() const
+{
+    LOGCALL(MATCH, const string *, "MSetPostList::get_sort_key", NO_ARGS);
+    Assert(cursor != -1);
+    RETURN(&mset_internal->items[cursor].sort_key);
+}
+
+const string *
 MSetPostList::get_collapse_key() const
 {
     LOGCALL(MATCH, const string *, "MSetPostList::get_collapse_key", NO_ARGS);

xapian-core/matcher/msetpostlist.h

@@ -68 +68 @@
 
     double get_weight() const;
 
+    const string * get_sort_key() const;
+
     const string * get_collapse_key() const;
 
     /// Not implemented for MSetPostList.

xapian-core/matcher/multimatch.cc

@@ -639 +639 @@
         }
 
         if (sort_by != REL) {
-            if (sorter) {
+            const string * ptr = pl->get_sort_key();
+            if (ptr) {
+                new_item.sort_key = *ptr;
+            } else if (sorter) {
                 new_item.sort_key = (*sorter)(doc);
             } else {
                 new_item.sort_key = vsdoc.get_value(sort_key);

xapian-core/net/serialise.cc

@@ -172 +172 @@
     result += serialise_double(mset.internal->percent_factor);
 
     result += encode_length(mset.size());
+    size_t j = 0;
     for (Xapian::MSetIterator i = mset.begin(); i != mset.end(); ++i) {
         result += serialise_double(i.get_weight());
         result += encode_length(*i);
+        const string & sort_key = mset.internal->items[j++].sort_key;
+        result += encode_length(sort_key.size());
+        result += sort_key;
+        result += i.get_collapse_key();
         result += encode_length(i.get_collapse_key().size());
         result += i.get_collapse_key();
         result += encode_length(i.get_collapse_count());
@@ -207 +212 @@
         double wt = unserialise_double(&p, p_end);
         Xapian::docid did = decode_length(&p, p_end, false);
         size_t len = decode_length(&p, p_end, true);
+        string sort_key(p, len);
+        p += len;
+        len = decode_length(&p, p_end, true);
         string key(p, len);
         p += len;
         Xapian::doccount collapse_cnt = decode_length(&p, p_end, false);
         items.push_back(Xapian::Internal::MSetItem(wt, did, key, collapse_cnt));
+        swap(items.back().sort_key, sort_key);
     }
 
     AutoPtr<Xapian::Weight::Internal> stats;