lib: optimize counting documents

[notmuch] / lib / query.cc

diff --git a/lib/query.cc b/lib/query.cc
index 7235fde12f560c9fd9b77b29359c8667bc392304..4ccd81046128052f3461622e8a58c5c63af782f0 100644 (file)
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
@@ -299,9 +299,10 @@ _notmuch_query_search_documents (notmuch_query_t *query,
 
     } catch (const Xapian::Error &error) {
        _notmuch_database_log (notmuch,
-                              "A Xapian exception occurred performing query: %s\n"
+                              "A Xapian exception occurred performing query: %s\n",
+                              error.get_msg().c_str());
+       _notmuch_database_log_append (notmuch,
                               "Query string was: %s\n",
-                              error.get_msg().c_str(),
                               query->query_string);
 
        notmuch->exception_reported = TRUE;
@@ -605,18 +606,20 @@ _notmuch_query_count_documents (notmuch_query_t *query, const char *type, unsign
        /*
         * Set the checkatleast parameter to the number of documents
         * in the database to make get_matches_estimated() exact.
+        * Set the max parameter to 0 to avoid fetching documents we will discard.
         */
-       mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount (),
+       mset = enquire.get_mset (0, 0,
                                 notmuch->xapian_db->get_doccount ());
 
        count = mset.get_matches_estimated();
 
     } catch (const Xapian::Error &error) {
        _notmuch_database_log (notmuch,
-                              "A Xapian exception occurred performing query: %s\n"
-                              "Query string was: %s\n",
-                              error.get_msg().c_str(),
-                              query->query_string);
+                              "A Xapian exception occurred performing query: %s\n",
+                              error.get_msg().c_str());
+       _notmuch_database_log_append (notmuch,
+                                     "Query string was: %s\n",
+                                     query->query_string);
        return NOTMUCH_STATUS_XAPIAN_EXCEPTION;
     }