debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-09 10:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: Use database features to drive upgrade

Browse source 
Previously, we had database version information hard-coded in the
upgrade code.  Slightly re-organize the upgrade process around the set
of new database features to be enabled by the upgrade.
This commit is contained in:
Austin Clements 2014-08-25 13:26:04 -04:00 committed by David Bremner
parent 4a38588488
commit 48db8c8b60
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/database.cc
View file

@ -1202,11 +1202,12 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
void *closure) void *closure)
{ {
void *local = talloc_new (NULL); void *local = talloc_new (NULL);
Xapian::TermIterator t, t_end;
Xapian::WritableDatabase *db; Xapian::WritableDatabase *db;
struct sigaction action; struct sigaction action;
struct itimerval timerval; struct itimerval timerval;
notmuch_bool_t timer_is_active = FALSE; notmuch_bool_t timer_is_active = FALSE;
unsigned int version; enum _notmuch_features target_features, new_features;
notmuch_status_t status; notmuch_status_t status;
unsigned int count = 0, total = 0; unsigned int count = 0, total = 0;
@ -1216,9 +1217,10 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
db = static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db); db = static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db);
version = notmuch_database_get_version (notmuch); target_features = notmuch->features | NOTMUCH_FEATURES_CURRENT;
new_features = NOTMUCH_FEATURES_CURRENT & ~notmuch->features;
if (version >= NOTMUCH_DATABASE_VERSION) if (! new_features)
return NOTMUCH_STATUS_SUCCESS; return NOTMUCH_STATUS_SUCCESS;
if (progress_notify) { if (progress_notify) {
@ -1244,18 +1246,17 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
/* Set the target features so we write out changes in the desired /* Set the target features so we write out changes in the desired
* format. */ * format. */
notmuch->features |= NOTMUCH_FEATURES_CURRENT; notmuch->features = target_features;
/* Before version 1, each message document had its filename in the /* Before version 1, each message document had its filename in the
* data field. Copy that into the new format by calling * data field. Copy that into the new format by calling
* notmuch_message_add_filename. * notmuch_message_add_filename.
*/ */
if (version < 1) { if (new_features & NOTMUCH_FEATURE_FILE_TERMS) {
notmuch_query_t *query = notmuch_query_create (notmuch, ""); notmuch_query_t *query = notmuch_query_create (notmuch, "");
notmuch_messages_t *messages; notmuch_messages_t *messages;
notmuch_message_t *message; notmuch_message_t *message;
char *filename; char *filename;
Xapian::TermIterator t, t_end;
total = notmuch_query_count_messages (query); total = notmuch_query_count_messages (query);
@ -1284,11 +1285,12 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
} }
notmuch_query_destroy (query); notmuch_query_destroy (query);
}
/* Also, before version 1 we stored directory timestamps in /* Also, before version 1 we stored directory timestamps in
* XTIMESTAMP documents instead of the current XDIRECTORY * XTIMESTAMP documents instead of the current XDIRECTORY
* documents. So copy those as well. */ * documents. So copy those as well. */
if (new_features & NOTMUCH_FEATURE_DIRECTORY_DOCS) {
t_end = notmuch->xapian_db->allterms_end ("XTIMESTAMP"); t_end = notmuch->xapian_db->allterms_end ("XTIMESTAMP");
for (t = notmuch->xapian_db->allterms_begin ("XTIMESTAMP"); for (t = notmuch->xapian_db->allterms_begin ("XTIMESTAMP");
@ -1332,7 +1334,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
* stemmed. Change it to the current boolean prefix. Add "path:" * stemmed. Change it to the current boolean prefix. Add "path:"
* prefixes while at it. * prefixes while at it.
*/ */
if (version < 2) { if (new_features & NOTMUCH_FEATURE_BOOL_FOLDER) {
notmuch_query_t *query = notmuch_query_create (notmuch, ""); notmuch_query_t *query = notmuch_query_create (notmuch, "");
notmuch_messages_t *messages; notmuch_messages_t *messages;
notmuch_message_t *message; notmuch_message_t *message;