Re: [PATCH 2/3] Produce status messages during compacting

diff --git a/9d/ba289677ba06bd8d0700bf3d50eed3f58d65cf b/9d/ba289677ba06bd8d0700bf3d50eed3f58d65cf
new file mode 100644 (file)
index 0000000..0eb84b1
--- /dev/null
+++ b/9d/ba289677ba06bd8d0700bf3d50eed3f58d65cf
@@ -0,0 +1,120 @@
+Return-Path: <jani@nikula.org>\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 F1901431FBD\r
+       for <notmuch@notmuchmail.org>; Wed, 17 Oct 2012 11:59:21 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 tF3dlUF1wrY2 for <notmuch@notmuchmail.org>;\r
+       Wed, 17 Oct 2012 11:59:21 -0700 (PDT)\r
+Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com\r
+       [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 5277C431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 17 Oct 2012 11:59:21 -0700 (PDT)\r
+Received: by mail-lb0-f181.google.com with SMTP id gg6so5834698lbb.26\r
+       for <notmuch@notmuchmail.org>; Wed, 17 Oct 2012 11:59:19 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+       :mime-version:content-type:x-gm-message-state;\r
+       bh=XztTrX+hvQxfXSIpdwOGFwWGruwRzFsl6JRBTe0KJ6Y=;\r
+       b=MLz5+TN99l8htqavTr5pZqL/Al56pR5+c2qcTw6PCgttMu7e6xPZIK7hKYJLmg/2ep\r
+       PCfD8GGhyukQcxeU2pzero7s92is4iFK1rpRVavmynuX0UqF+o90KKYPjtaWb8gQVjx0\r
+       OaENz3Q1jAGi870loAAAidUmrXboJw8ZNyrtjTxP+BpCgzv++8WZVzW8Fh8fHafmnkKD\r
+       GfJz8g1ZmrzHa8rdGJy7EwuY/4cvZ2iXUJjCX9lnfzuWX+74Sq8QHZj5uo76tn8CDJPN\r
+       +tcoYCgwHDKPNXkiQs1hMHfVVvVyM+W9xCus8TT97P6i9+Nle4rRI62IhQ4vgXp7CzMz\r
+       9eIQ==\r
+Received: by 10.152.124.180 with SMTP id mj20mr16578515lab.43.1350500359583;\r
+       Wed, 17 Oct 2012 11:59:19 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id fe5sm4414122lbb.6.2012.10.17.11.59.17\r
+       (version=SSLv3 cipher=OTHER); Wed, 17 Oct 2012 11:59:18 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Ben Gamari <bgamari.foss@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/3] Produce status messages during compacting\r
+In-Reply-To: <1350487737-32058-3-git-send-email-bgamari.foss@gmail.com>\r
+References: <1350487737-32058-1-git-send-email-bgamari.foss@gmail.com>\r
+       <1350487737-32058-3-git-send-email-bgamari.foss@gmail.com>\r
+User-Agent: Notmuch/0.14+46~g272a1f1 (http://notmuchmail.org) Emacs/23.3.1\r
+       (i686-pc-linux-gnu)\r
+Date: Wed, 17 Oct 2012 21:59:16 +0300\r
+Message-ID: <871ugw3oxn.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Gm-Message-State:\r
+ ALoCoQlS1ZlpqmLdoxxNIZw7z+p35fziKjQDgZd8d56qutNPEayb5tJ5XL58+rW22YM94l5uNSmZ\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: Wed, 17 Oct 2012 18:59:22 -0000\r
+\r
+\r
+Again, a commit message saying *why* having a flood of status messages\r
+is a good idea would be appreciated. I'm not sure it is a good idea.\r
+\r
+On Wed, 17 Oct 2012, Ben Gamari <bgamari.foss@gmail.com> wrote:\r
+> ---\r
+>  lib/database.cc |   15 ++++++++++++++-\r
+>  1 file changed, 14 insertions(+), 1 deletion(-)\r
+>\r
+> diff --git a/lib/database.cc b/lib/database.cc\r
+> index 6e83a61..49aa36d 100644\r
+> --- a/lib/database.cc\r
+> +++ b/lib/database.cc\r
+> @@ -780,11 +780,24 @@ notmuch_database_close (notmuch_database_t *notmuch)\r
+>      notmuch->value_range_processor = NULL;\r
+>  }\r
+>  \r
+> +class NotmuchCompactor : public Xapian::Compactor\r
+> +{\r
+> +public:\r
+> +    virtual void\r
+> +    set_status (const std::string &table, const std::string &status)\r
+> +    {\r
+> +    if (status.length() == 0)\r
+> +        fprintf (stderr, "compacting table %s:\n", table.c_str());\r
+\r
+It's not an error, so stderr seems wrong.\r
+\r
+BR,\r
+Jani.\r
+\r
+> +    else\r
+> +        fprintf (stderr, "     %s\n", status.c_str());\r
+> +    }\r
+> +};\r
+> +\r
+>  void\r
+>  notmuch_database_close_compact (notmuch_database_t *notmuch)\r
+>  {\r
+>      void *local = talloc_new (NULL);\r
+> -    Xapian::Compactor compactor;\r
+> +    NotmuchCompactor compactor;\r
+>      char *notmuch_path, *xapian_path, *compact_xapian_path, *old_xapian_path;\r
+>  \r
+>  #if HAVE_XAPIAN_COMPACT\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r