From 5d270540f68a1f5d89397f5c1ef15fc326397d76 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Thu, 18 Oct 2012 09:44:04 +0300 Subject: [PATCH] Re: [PATCH 1/3] Add notmuch_database_close_compact --- c5/1d9eed1c924c7e0554e7d46a4ae3b63677a217 | 221 ++++++++++++++++++++++ 1 file changed, 221 insertions(+) create mode 100644 c5/1d9eed1c924c7e0554e7d46a4ae3b63677a217 diff --git a/c5/1d9eed1c924c7e0554e7d46a4ae3b63677a217 b/c5/1d9eed1c924c7e0554e7d46a4ae3b63677a217 new file mode 100644 index 000000000..8ba23fe7f --- /dev/null +++ b/c5/1d9eed1c924c7e0554e7d46a4ae3b63677a217 @@ -0,0 +1,221 @@ +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 E226E431FC2 + for ; Wed, 17 Oct 2012 23:44:02 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 BsfIFA5JngjT for ; + Wed, 17 Oct 2012 23:44:01 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 7ADBD431FB6 + for ; Wed, 17 Oct 2012 23:44:01 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id B7D8B1000E5; + Thu, 18 Oct 2012 09:44:04 +0300 (EEST) +From: Tomi Ollila +To: Ben Gamari , notmuch@notmuchmail.org +Subject: Re: [PATCH 1/3] Add notmuch_database_close_compact +In-Reply-To: <1350487737-32058-2-git-send-email-bgamari.foss@gmail.com> +References: <1350487737-32058-1-git-send-email-bgamari.foss@gmail.com> + <1350487737-32058-2-git-send-email-bgamari.foss@gmail.com> +User-Agent: Notmuch/0.14+51~g62cd13b (http://notmuchmail.org) Emacs/24.2.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +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: Thu, 18 Oct 2012 06:44:03 -0000 + +On Wed, Oct 17 2012, Ben Gamari wrote: + +> --- +> configure | 21 ++++++++++++++++++++- +> lib/database.cc | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ +> lib/notmuch.h | 14 ++++++++++++++ +> 3 files changed, 88 insertions(+), 1 deletion(-) +> +> diff --git a/configure b/configure +> index acb90a8..6551b13 100755 +> --- a/configure +> +++ b/configure +> @@ -270,7 +270,8 @@ printf "Checking for Xapian development files... " +> have_xapian=0 +> for xapian_config in ${XAPIAN_CONFIG}; do +> if ${xapian_config} --version > /dev/null 2>&1; then +> - printf "Yes (%s).\n" $(${xapian_config} --version | sed -e 's/.* //') +> + xapian_version=$(${xapian_config} --version | sed -e 's/.* //') +> + printf "Yes (%s).\n" ${xapian_version} +> have_xapian=1 +> xapian_cxxflags=$(${xapian_config} --cxxflags) +> xapian_ldflags=$(${xapian_config} --libs) +> @@ -282,6 +283,20 @@ if [ ${have_xapian} = "0" ]; then +> errors=$((errors + 1)) +> fi +> +> +have_xapian_compact=0 +> +if [ ${have_xapian} = "1" ]; then +> + printf "Checking for Xapian compact support... " +> + case "${xapian_version}" in +> + 0.*|1.[01].*|1.2.[0-5]) +> + printf "No.\n" ;; +> + [1-9]*.[0-9]*.[0-9]*) +> + have_xapian_compact=1 +> + printf "Yes.\n" ;; +> + *) +> + printf "Unknown version.\n" ;; +> + esac +> +fi + +This is pretty good approximation(*) for the version check, but some +comments are in place, like mentioning that compaction is supported +in Xapian versions 1.2.6 and newer (as the code is not obvious to +casual reader). + +(*) The match for yes part gives some room for non-digit version +parts (if that would ever be needed) and also it rules out (most) +cases where garbage were assigned to xapian_version. + +Tomi + +> + +> printf "Checking for GMime development files... " +> have_gmime=0 +> IFS=';' +> @@ -679,6 +694,9 @@ LINKER_RESOLVES_LIBRARY_DEPENDENCIES = ${linker_resolves_library_dependencies} +> XAPIAN_CXXFLAGS = ${xapian_cxxflags} +> XAPIAN_LDFLAGS = ${xapian_ldflags} +> +> +# Whether compact is supported by this version of Xapian +> +HAVE_XAPIAN_COMPACT = ${have_xapian_compact} +> + +> # Flags needed to compile and link against GMime-2.4 +> GMIME_CFLAGS = ${gmime_cflags} +> GMIME_LDFLAGS = ${gmime_ldflags} +> @@ -715,6 +733,7 @@ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ +> CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ +> \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ +> \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\ +> + -DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT) \\ +> -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) +> CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS) +> EOF +> diff --git a/lib/database.cc b/lib/database.cc +> index 761dc1a..6e83a61 100644 +> --- a/lib/database.cc +> +++ b/lib/database.cc +> @@ -781,6 +781,60 @@ notmuch_database_close (notmuch_database_t *notmuch) +> } +> +> void +> +notmuch_database_close_compact (notmuch_database_t *notmuch) +> +{ +> + void *local = talloc_new (NULL); +> + Xapian::Compactor compactor; +> + char *notmuch_path, *xapian_path, *compact_xapian_path, *old_xapian_path; +> + +> +#if HAVE_XAPIAN_COMPACT +> + if (! (notmuch_path = talloc_asprintf (local, "%s/%s", notmuch->path, ".notmuch"))) { +> + fprintf (stderr, "Out of memory\n"); +> + goto DONE; +> + } +> + +> + if (! (xapian_path = talloc_asprintf (local, "%s/%s", notmuch_path, "xapian"))) { +> + fprintf (stderr, "Out of memory\n"); +> + goto DONE; +> + } +> + +> + if (! (compact_xapian_path = talloc_asprintf (local, "%s.compact", xapian_path))) { +> + fprintf (stderr, "Out of memory\n"); +> + goto DONE; +> + } +> + +> + if (! (old_xapian_path = talloc_asprintf (local, "%s.old", xapian_path))) { +> + fprintf (stderr, "Out of memory\n"); +> + goto DONE; +> + } +> + +> + try { +> + compactor.set_renumber(false); +> + compactor.add_source(xapian_path); +> + compactor.set_destdir(compact_xapian_path); +> + compactor.compact(); +> + +> + if (rename(xapian_path, old_xapian_path)) { +> + fprintf (stderr, "Error moving old database out of the way\n"); +> + goto DONE; +> + } +> + +> + if (rename(compact_xapian_path, xapian_path)) { +> + fprintf (stderr, "Error moving compacted database\n"); +> + goto DONE; +> + } +> + } catch (Xapian::InvalidArgumentError e) { +> + fprintf (stderr, "Error while compacting: %s", e.get_msg().c_str()); +> + } +> + +> +#endif +> + +> + notmuch_database_close(notmuch); +> +DONE: +> + talloc_free(local); +> +} +> + +> +void +> notmuch_database_destroy (notmuch_database_t *notmuch) +> { +> notmuch_database_close (notmuch); +> diff --git a/lib/notmuch.h b/lib/notmuch.h +> index 3633bed..50babfb 100644 +> --- a/lib/notmuch.h +> +++ b/lib/notmuch.h +> @@ -215,6 +215,20 @@ notmuch_database_open (const char *path, +> void +> notmuch_database_close (notmuch_database_t *database); +> +> +/* Close the given notmuch database and then compact it. +> + * +> + * After notmuch_database_close_compact has been called, calls to +> + * other functions on objects derived from this database may either +> + * behave as if the database had not been closed (e.g., if the +> + * required data has been cached) or may fail with a +> + * NOTMUCH_STATUS_XAPIAN_EXCEPTION. +> + * +> + * notmuch_database_close_compact can be called multiple times. Later +> + * calls have no effect. +> + */ +> +void +> +notmuch_database_close_compact (notmuch_database_t *notmuch); +> + +> /* Destroy the notmuch database, closing it if necessary and freeing +> * all associated resources. */ +> void +> -- +> 1.7.10.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2