[Patch v4 7/9] lib: migrate notmuch_database_upgrade to new query_search API

diff --git a/ba/838282c28a07d50fe93dc11583e5eb9bd3af9c b/ba/838282c28a07d50fe93dc11583e5eb9bd3af9c
new file mode 100644 (file)
index 0000000..72c23d8
--- /dev/null
+++ b/ba/838282c28a07d50fe93dc11583e5eb9bd3af9c
@@ -0,0 +1,73 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 711386DE15DD\r
+ for <notmuch@notmuchmail.org>; Sun, 27 Sep 2015 08:34:48 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.108\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.108 tagged_above=-999 required=5 tests=[AWL=0.108]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 7Yz9ypQt0IvA for <notmuch@notmuchmail.org>;\r
+ Sun, 27 Sep 2015 08:34:46 -0700 (PDT)\r
+Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id A2E706DE14F2\r
+ for <notmuch@notmuchmail.org>; Sun, 27 Sep 2015 08:34:46 -0700 (PDT)\r
+Received: from remotemail by gitolite.debian.net with local (Exim 4.80)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1ZgDxk-0008F1-IB; Sun, 27 Sep 2015 15:34:04 +0000\r
+Received: (nullmailer pid 11943 invoked by uid 1000); Sun, 27 Sep 2015\r
+ 15:32:11 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v4 7/9] lib: migrate notmuch_database_upgrade to new\r
+ query_search API\r
+Date: Sun, 27 Sep 2015 12:32:01 -0300\r
+Message-Id: <1443367923-11867-8-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.5.3\r
+In-Reply-To: <1443367923-11867-1-git-send-email-david@tethera.net>\r
+References: <1443367923-11867-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\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: Sun, 27 Sep 2015 15:34:48 -0000\r
+\r
+Here we depend on the error path cleaning up query\r
+---\r
+ lib/database.cc | 7 ++++---\r
+ 1 file changed, 4 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index f39d448..5e86955 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -1450,9 +1450,10 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+ \r
+       query = notmuch_query_create (notmuch, "");\r
+ \r
+-      /* XXX: this should use the _st version, but needs an error\r
+-         path */\r
+-      for (messages = notmuch_query_search_messages (query);\r
++      status = notmuch_query_search_messages_st (query, &messages);\r
++      if (status)\r
++          goto DONE;\r
++      for (;\r
+            notmuch_messages_valid (messages);\r
+            notmuch_messages_move_to_next (messages))\r
+       {\r
+-- \r
+2.5.3\r
+\r