debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 20:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix "notmuch new" (bad performance, and no committing of results).

Browse source 
We were incorrectly only destroying messages in the case of
successful addition to the database, and not in other cases,
(such as failure due to FILE_NOT_EMAIL).

I'm still not entirely sure why this was performing abysmally, (as in
making an operation that should take a small fraction of a second take
10 seconds), nor why it was causing the database to entirely fail to
get new results.

But fortunately, this all seems to work now.
This commit is contained in:
Carl Worth 2009-10-27 16:07:27 -07:00
parent 16003e1f8f
commit 8969720108
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
notmuch.c
View file

@ -180,7 +180,7 @@ add_files_recursive (notmuch_database_t *notmuch,
char *next = NULL; char *next = NULL;
time_t path_mtime, path_dbtime; time_t path_mtime, path_dbtime;
notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS; notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS;
notmuch_message_t *message, **closure; notmuch_message_t *message = NULL, **closure;
/* If we're told to, we bail out on encountering a read-only /* If we're told to, we bail out on encountering a read-only
* directory, (with this being a clear clue from the user to * directory, (with this being a clear clue from the user to
@ -264,10 +264,8 @@ add_files_recursive (notmuch_database_t *notmuch,
/* success */ /* success */
case NOTMUCH_STATUS_SUCCESS: case NOTMUCH_STATUS_SUCCESS:
state->added_messages++; state->added_messages++;
if (state->callback) { if (state->callback)
(state->callback) (message); (state->callback) (message);
notmuch_message_destroy (message);
}
break; break;
/* Non-fatal issues (go on to next file) */ /* Non-fatal issues (go on to next file) */
case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID: case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
@ -292,6 +290,12 @@ add_files_recursive (notmuch_database_t *notmuch,
INTERNAL_ERROR ("add_message returned unexpected value: %d", status); INTERNAL_ERROR ("add_message returned unexpected value: %d", status);
goto DONE; goto DONE;
} }
if (message) {
notmuch_message_destroy (message);
message = NULL;
}
if (state->processed_files % 1000 == 0) if (state->processed_files % 1000 == 0)
add_files_print_progress (state); add_files_print_progress (state);
} }