aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJani Nikula <jani@nikula.org>2014-10-14 19:32:54 +0300
committerDavid Bremner <david@tethera.net>2015-03-13 07:58:55 +0100
commit6d44e5ac4743f618513c9a080733d91afa683f16 (patch)
treeaf98d5783411b5f2d216d63ed7bca54945287e68 /lib
parent76f8498df61577c2f2e8f22e34a93a37ea532a03 (diff)
lib: make notmuch_query_count_messages explicitely exact
The default is actually exact if no checkatleast parameter is specified. This change makes that explicit, mainly for documentation, but also to be safe in the unlikely event of a change of default. [ commit message rewritten by db based on id:87lho0nlkk.fsf@nikula.org ]
Diffstat (limited to 'lib')
-rw-r--r--lib/notmuch.h6
-rw-r--r--lib/query.cc7
2 files changed, 9 insertions, 4 deletions
diff --git a/lib/notmuch.h b/lib/notmuch.h
index f0b60b83..f0662454 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -909,10 +909,10 @@ void
notmuch_threads_destroy (notmuch_threads_t *threads);
/**
- * Return an estimate of the number of messages matching a search.
+ * Return the number of messages matching a search.
*
- * This function performs a search and returns Xapian's best
- * guess as to number of matching messages.
+ * This function performs a search and returns the number of matching
+ * messages.
*
* If a Xapian exception occurs, this function may return 0 (after
* printing a message).
diff --git a/lib/query.cc b/lib/query.cc
index 9279915d..57aa6d24 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -587,7 +587,12 @@ notmuch_query_count_messages (notmuch_query_t *query)
enquire.set_query (final_query);
- mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ());
+ /*
+ * Set the checkatleast parameter to the number of documents
+ * in the database to make get_matches_estimated() exact.
+ */
+ mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount (),
+ notmuch->xapian_db->get_doccount ());
count = mset.get_matches_estimated();