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