From 2249bfe009d8b456697d9b5ebfaabf3afc9f77da Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 30 Jul 2014 12:48:07 +2000 Subject: [PATCH] [PATCH v2 09/14] lib: Use database features to drive upgrade --- 02/343b1e243bb15dcb3a63549816338f57ed5547 | 165 ++++++++++++++++++++++ 1 file changed, 165 insertions(+) create mode 100644 02/343b1e243bb15dcb3a63549816338f57ed5547 diff --git a/02/343b1e243bb15dcb3a63549816338f57ed5547 b/02/343b1e243bb15dcb3a63549816338f57ed5547 new file mode 100644 index 000000000..5855a1c25 --- /dev/null +++ b/02/343b1e243bb15dcb3a63549816338f57ed5547 @@ -0,0 +1,165 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 175C3429E31 + for ; Tue, 29 Jul 2014 09:48:45 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id pqUN-NnF6Yl6 for ; + Tue, 29 Jul 2014 09:48:39 -0700 (PDT) +Received: from dmz-mailsec-scanner-3.mit.edu (dmz-mailsec-scanner-3.mit.edu + [18.9.25.14]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 83E12431FC7 + for ; Tue, 29 Jul 2014 09:48:21 -0700 (PDT) +X-AuditID: 1209190e-f79946d000007db1-c7-53d7d054e2c7 +Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) + (using TLS with cipher AES256-SHA (256/256 bits)) + (Client did not present a certificate) + by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP + id 69.F5.32177.450D7D35; Tue, 29 Jul 2014 12:48:20 -0400 (EDT) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id s6TGmIaR003295; + Tue, 29 Jul 2014 12:48:18 -0400 +Received: from drake.dyndns.org (31-33-71.wireless.csail.mit.edu + [128.31.33.71]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s6TGmFfJ030264 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Tue, 29 Jul 2014 12:48:17 -0400 +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1XCAZS-0007Gz-Ta; Tue, 29 Jul 2014 12:48:14 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 09/14] lib: Use database features to drive upgrade +Date: Tue, 29 Jul 2014 12:48:07 -0400 +Message-Id: <1406652492-27803-10-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 2.0.0 +In-Reply-To: <1406652492-27803-1-git-send-email-amdragon@mit.edu> +References: <1406652492-27803-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixG6nohty4XqwweZGHYvVc3ksrt+cyezA + 5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZRy4KV2wRKriweL3TA2MLaJdjJwcEgImEt3d + k5ghbDGJC/fWs3UxcnEICcxmkrh48QUjhLORUeLS1jVQmWNMEru+N7JCOHMZJa7PvQjWzyag + IbFt/3JGEFtEQFpi593ZrCA2s4CjxOf9i9hAbGEBV4nXH14xgdgsAqoS15uPAtkcHLxANRd/ + 80KcISfRcOMTWDknUPjWvbtg5UICDhKHZm1mmcDIv4CRYRWjbEpulW5uYmZOcWqybnFyYl5e + apGusV5uZoleakrpJkZQGHFK8u1g/HpQ6RCjAAejEg/vhrnXgoVYE8uKK3MPMUpyMCmJ8urt + ux4sxJeUn1KZkVicEV9UmpNafIhRgoNZSYSX7yxQjjclsbIqtSgfJiXNwaIkzvvW2ipYSCA9 + sSQ1OzW1ILUIJivDwaEkwfv6PFCjYFFqempFWmZOCUKaiYMTZDgP0PB9IDW8xQWJucWZ6RD5 + U4yKUuK8m0ASAiCJjNI8uF5YnL9iFAd6RZj3IEgVDzBFwHW/AhrMBDSY1QVscEkiQkqqgVH9 + DBfnIZ9lTjb3b5sm8yVf+Bu3+Udt2v4rK72WS0xIc14VzXMjP/yZYe+qN1msbJdnyvlGNZi4 + PH7cI2p88WLLhXseLff2lPxrbQiocpBafjb48Crhu6VzJDb+yDBxEwo3Pmh89/6TcOeVFxoO + X6/uPivyIK556WLuovVn0555Hdk+u8Tf8KoSS3FGoqEWc1FxIgAAOkvjzgIAAA== +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 29 Jul 2014 16:48:45 -0000 + +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. +--- + lib/database.cc | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +diff --git a/lib/database.cc b/lib/database.cc +index e4a1072..5f68550 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -1195,11 +1195,12 @@ notmuch_database_upgrade (notmuch_database_t *notmuch, + void *closure) + { + void *local = talloc_new (NULL); ++ Xapian::TermIterator t, t_end; + Xapian::WritableDatabase *db; + struct sigaction action; + struct itimerval timerval; + notmuch_bool_t timer_is_active = FALSE; +- unsigned int version; ++ unsigned int target_features, new_features; + notmuch_status_t status; + unsigned int count = 0, total = 0; + +@@ -1209,9 +1210,10 @@ notmuch_database_upgrade (notmuch_database_t *notmuch, + + db = static_cast (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; + + if (progress_notify) { +@@ -1239,12 +1241,11 @@ notmuch_database_upgrade (notmuch_database_t *notmuch, + * data field. Copy that into the new format by calling + * notmuch_message_add_filename. + */ +- if (version < 1) { ++ if (new_features & NOTMUCH_FEATURE_FILE_TERMS) { + notmuch_query_t *query = notmuch_query_create (notmuch, ""); + notmuch_messages_t *messages; + notmuch_message_t *message; + char *filename; +- Xapian::TermIterator t, t_end; + + total = notmuch_query_count_messages (query); + +@@ -1273,11 +1274,12 @@ notmuch_database_upgrade (notmuch_database_t *notmuch, + } + + notmuch_query_destroy (query); ++ } + +- /* Also, before version 1 we stored directory timestamps in +- * XTIMESTAMP documents instead of the current XDIRECTORY +- * documents. So copy those as well. */ +- ++ /* Also, before version 1 we stored directory timestamps in ++ * XTIMESTAMP documents instead of the current XDIRECTORY ++ * documents. So copy those as well. */ ++ if (new_features & NOTMUCH_FEATURE_DIRECTORY_DOCS) { + t_end = notmuch->xapian_db->allterms_end ("XTIMESTAMP"); + + for (t = notmuch->xapian_db->allterms_begin ("XTIMESTAMP"); +@@ -1321,7 +1323,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch, + * stemmed. Change it to the current boolean prefix. Add "path:" + * prefixes while at it. + */ +- if (version < 2) { ++ if (new_features & NOTMUCH_FEATURE_BOOL_FOLDER) { + notmuch_query_t *query = notmuch_query_create (notmuch, ""); + notmuch_messages_t *messages; + notmuch_message_t *message; +@@ -1350,7 +1352,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch, + notmuch_query_destroy (query); + } + +- notmuch->features |= NOTMUCH_FEATURES_CURRENT; ++ notmuch->features = target_features; + db->set_metadata ("features", _print_features (local, notmuch->features)); + db->set_metadata ("version", STRINGIFY (NOTMUCH_DATABASE_VERSION)); + +-- +2.0.0 + -- 2.26.2