unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 1/3] lib: migrate to post Xapian 1.3.4 compact support
Date: Tue,  7 Jul 2020 07:56:45 -0300	[thread overview]
Message-ID: <20200707105647.433187-2-david@tethera.net> (raw)
In-Reply-To: <20200707105647.433187-1-david@tethera.net>

The old API was deprecated in Xapian 1.3.4 and (will be) removed in 1.5.0
---
 lib/database.cc | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/database.cc b/lib/database.cc
index 78b5fec9..43bfac4e 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1281,11 +1281,7 @@ notmuch_database_compact (const char *path,
 
     try {
 	NotmuchCompactor compactor (status_cb, closure);
-
-	compactor.set_renumber (false);
-	compactor.add_source (xapian_path);
-	compactor.set_destdir (compact_xapian_path);
-	compactor.compact ();
+	notmuch->xapian_db->compact (compact_xapian_path, Xapian::DBCOMPACT_NO_RENUMBER, 0, compactor);
     } catch (const Xapian::Error &error) {
 	_notmuch_database_log (notmuch, "Error while compacting: %s\n", error.get_msg ().c_str ());
 	ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
-- 
2.27.0

  reply	other threads:[~2020-07-07 10:57 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-07 10:56 v2 port to xapian 1.5 David Bremner
2020-07-07 10:56 ` David Bremner [this message]
2020-07-07 10:56 ` [PATCH 2/3] lib: migrate from Xapian ValueRangeProcessor to RangeProcessor David Bremner
2020-07-07 10:56 ` [PATCH 3/3] test: drop upgrade from v1 tests David Bremner
2020-07-11 20:29 ` v2 port to xapian 1.5 David Bremner
  -- strict thread matches above, loose matches on Subject: below --
2020-06-17 11:04 Port to Xapian 1.5 David Bremner
2020-06-17 11:04 ` [PATCH 1/3] lib: migrate to post Xapian 1.3.4 compact support David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200707105647.433187-2-david@tethera.net \
    --to=david@tethera.net \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).