alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* remove the needless batching in mu-msg-iter, mu-query, update callers

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-06-02 17:35:46 +03:00
parent fbaa1fc66e
commit 794825e297
6 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mu-cmd-find.c
View File

@ -181,7 +181,8 @@ run_query (MuQuery *xapian, const gchar *query, MuConfig *opts,
err = NULL; err = NULL;
iter = mu_query_run (xapian, query, sortid, iter = mu_query_run (xapian, query, sortid,
opts->descending ? FALSE : TRUE, 0, &err); opts->descending ? FALSE : TRUE,
&err);
if (!iter) { if (!iter) {
g_warning ("error: %s", err->message); g_warning ("error: %s", err->message);
g_error_free (err); g_error_free (err);

8
src/mu-query.cc
View File

@ -335,7 +335,7 @@ mu_query_preprocess (const char *query)
MuMsgIter* MuMsgIter*
mu_query_run (MuQuery *self, const char* searchexpr, mu_query_run (MuQuery *self, const char* searchexpr,
MuMsgFieldId sortfieldid, gboolean ascending, MuMsgFieldId sortfieldid, gboolean ascending,
size_t batchsize, GError **err) GError **err)
{ {
g_return_val_if_fail (self, NULL); g_return_val_if_fail (self, NULL);
g_return_val_if_fail (searchexpr, NULL); g_return_val_if_fail (searchexpr, NULL);
@ -356,16 +356,14 @@ mu_query_run (MuQuery *self, const char* searchexpr,
Xapian::Enquire enq (self->_db); Xapian::Enquire enq (self->_db);
if (batchsize == 0)
batchsize = self->_db.get_doccount();
if (sortfieldid != MU_MSG_FIELD_ID_NONE) if (sortfieldid != MU_MSG_FIELD_ID_NONE)
enq.set_sort_by_value ((Xapian::valueno)sortfieldid, enq.set_sort_by_value ((Xapian::valueno)sortfieldid,
ascending ? true : false); ascending ? true : false);
enq.set_query(query); enq.set_query(query);
enq.set_cutoff(0,0); enq.set_cutoff(0,0);
return mu_msg_iter_new ((XapianEnquire*)&enq, batchsize); return mu_msg_iter_new ((XapianEnquire*)&enq,
self->_db.get_doccount());
} MU_XAPIAN_CATCH_BLOCK_RETURN(NULL); } MU_XAPIAN_CATCH_BLOCK_RETURN(NULL);
} }

6
src/mu-query.h
View File

@ -73,10 +73,6 @@ char* mu_query_version (MuQuery *store)
* sorting is not desired * sorting is not desired
* @param ascending if TRUE sort in ascending (A-Z) order, otherwise, * @param ascending if TRUE sort in ascending (A-Z) order, otherwise,
* sort in descending (Z-A) order * sort in descending (Z-A) order
* @param batchsize the size of batches to receive; this is mainly for
* reasons - it's best to get the size one wants to show the user at once.
* If you pass '0' as the batchsize, mu will use the maximum size (the count
* of documents in the database)
* @param err receives error information (if there is any); if * @param err receives error information (if there is any); if
* function returns non-NULL, err will _not_be set. err can be NULL * function returns non-NULL, err will _not_be set. err can be NULL
* possible error (err->code) is MU_ERROR_QUERY, * possible error (err->code) is MU_ERROR_QUERY,
@ -86,7 +82,7 @@ char* mu_query_version (MuQuery *store)
*/ */
MuMsgIter* mu_query_run (MuQuery *self, const char* expr, MuMsgIter* mu_query_run (MuQuery *self, const char* expr,
MuMsgFieldId sortfieldid, gboolean ascending, MuMsgFieldId sortfieldid, gboolean ascending,
size_t batchsize, GError **err) GError **err)
G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
/** /**

4
src/tests/test-mu-query.c
View File

@ -81,7 +81,7 @@ run_and_count_matches (const char *xpath, const char *query)
/* } */ /* } */
iter = mu_query_run (mquery, query, MU_MSG_FIELD_ID_NONE, iter = mu_query_run (mquery, query, MU_MSG_FIELD_ID_NONE,
FALSE, 1, NULL); FALSE, NULL);
mu_query_destroy (mquery); mu_query_destroy (mquery);
g_assert (iter); g_assert (iter);
@ -231,7 +231,7 @@ test_mu_query_accented_chars_01 (void)
query = mu_query_new (xpath, NULL); query = mu_query_new (xpath, NULL);
iter = mu_query_run (query, "fünkÿ", MU_MSG_FIELD_ID_NONE, iter = mu_query_run (query, "fünkÿ", MU_MSG_FIELD_ID_NONE,
FALSE, 1, NULL); FALSE, NULL);
err = NULL; err = NULL;
msg = mu_msg_iter_get_msg (iter, &err); /* don't unref */ msg = mu_msg_iter_get_msg (iter, &err); /* don't unref */
if (!msg) { if (!msg) {

3
toys/mug/mug-msg-list-view.c
View File

@ -335,7 +335,7 @@ run_query (const char *xpath, const char *query, MugMsgListView * self)
} }
iter = iter =
mu_query_run (xapian, query, MU_MSG_FIELD_ID_DATE, TRUE, 0, &err); mu_query_run (xapian, query, MU_MSG_FIELD_ID_DATE, TRUE, &err);
mu_query_destroy (xapian); mu_query_destroy (xapian);
if (!iter) { if (!iter) {
g_warning ("Error: %s", err->message); g_warning ("Error: %s", err->message);
@ -404,6 +404,7 @@ update_model (GtkListStore * store, const char *xpath, const char *query,
return count; return count;
} }
int int
mug_msg_list_view_query (MugMsgListView * self, const char *query) mug_msg_list_view_query (MugMsgListView * self, const char *query)
{ {

2
toys/mug2/mug-msg-list-view.c
View File

@ -335,7 +335,7 @@ run_query (const char *xpath, const char *query, MugMsgListView * self)
} }
iter = iter =
mu_query_run (xapian, query, MU_MSG_FIELD_ID_DATE, TRUE, 0, &err); mu_query_run (xapian, query, MU_MSG_FIELD_ID_DATE, TRUE, &err);
mu_query_destroy (xapian); mu_query_destroy (xapian);
if (!iter) { if (!iter) {
g_warning ("Error: %s", err->message); g_warning ("Error: %s", err->message);