From ac1b8a71248d440b84d9da5aba8540f65942097a Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 18 Oct 2012 11:28:55 +2000 Subject: [PATCH] [PATCH 1/3] Add notmuch_database_close_compact --- 21/e0c8f22f4106f1bf14a04ec7fa3bdb2132cead | 213 ++++++++++++++++++++++ 1 file changed, 213 insertions(+) create mode 100644 21/e0c8f22f4106f1bf14a04ec7fa3bdb2132cead diff --git a/21/e0c8f22f4106f1bf14a04ec7fa3bdb2132cead b/21/e0c8f22f4106f1bf14a04ec7fa3bdb2132cead new file mode 100644 index 000000000..2f4b0cbf0 --- /dev/null +++ b/21/e0c8f22f4106f1bf14a04ec7fa3bdb2132cead @@ -0,0 +1,213 @@ +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 393F6431FC4 + for ; Wed, 17 Oct 2012 08:29:41 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 QqpPI8iMmGQz for ; + Wed, 17 Oct 2012 08:29:39 -0700 (PDT) +Received: from mail-qa0-f53.google.com (mail-qa0-f53.google.com + [209.85.216.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id C923D431FBD + for ; Wed, 17 Oct 2012 08:29:39 -0700 (PDT) +Received: by mail-qa0-f53.google.com with SMTP id s11so640771qaa.5 + for ; Wed, 17 Oct 2012 08:29:38 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=R7lPcHbeLwXLL8I3ZI019OfJgN241NwP0vgjv/5EGSg=; + b=Lrx6lyPGQPtk+CFruF8nf0Ii4NpvtQ88swtUofW1Elmeh/Oi6v4mBnl+hVTsrTH9HT + DcLKjxyw8ZRTuujOatXajX1Sip+YbhLsc4GJ+tcBLDVs57QzgtZUQMip7V0nw9L8c6x/ + acele8eKpUMc363OpE7EUlJHmNYZvqIdfUZFQtRPFxDYi9OhUHc2kwHHmyRZEF2UC59d + pq63AQgX0o670asEhq5XE+tMWGS8kfBuGf3ZthTWhosOMrVfU618XEnNBKOgxVZNubh/ + kYUV6LuSyvOfL72dsswlw1bI3HGu8MUHAV5igfXHPKhi285vT3Fs28yTUfxe3KmT6d2Q + lqnw== +Received: by 10.229.69.67 with SMTP id y3mr8701964qci.136.1350487778104; + Wed, 17 Oct 2012 08:29:38 -0700 (PDT) +Received: from ben-laptop.hasb.physics.cns (physicsnat56.physics.umass.edu. + [128.119.50.38]) + by mx.google.com with ESMTPS id eq10sm13366039qab.0.2012.10.17.08.29.37 + (version=SSLv3 cipher=OTHER); Wed, 17 Oct 2012 08:29:37 -0700 (PDT) +From: Ben Gamari +To: notmuch@notmuchmail.org +Subject: [PATCH 1/3] Add notmuch_database_close_compact +Date: Wed, 17 Oct 2012 11:28:55 -0400 +Message-Id: <1350487737-32058-2-git-send-email-bgamari.foss@gmail.com> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1350487737-32058-1-git-send-email-bgamari.foss@gmail.com> +References: <1350487737-32058-1-git-send-email-bgamari.foss@gmail.com> +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: Wed, 17 Oct 2012 15:29:41 -0000 + +--- + 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 ++ + 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 + -- 2.26.2