From 65f923219e08193d590bec35e2c3995dc6a19395 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 18 May 2021 08:03:22 -0300 Subject: [PATCH] database/close: remove misleading code / comment Unfortunately, it doesn't make a difference if we call cancel_transaction or not, all uncommited changes are discarded if there is an open (unflushed) transaction. --- lib/database.cc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index 6db82373..aed05388 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -502,17 +502,9 @@ notmuch_database_close (notmuch_database_t *notmuch) * close it. Thus, we explicitly close it here. */ if (notmuch->open) { try { - /* If there's an outstanding transaction, it's unclear if - * closing the Xapian database commits everything up to - * that transaction, or may discard committed (but - * unflushed) transactions. To be certain, explicitly - * cancel any outstanding transaction before closing. */ - if (_notmuch_database_mode (notmuch) == NOTMUCH_DATABASE_MODE_READ_WRITE && - notmuch->atomic_nesting) - notmuch->writable_xapian_db->cancel_transaction (); - /* Close the database. This implicitly flushes - * outstanding changes. */ + * outstanding changes. If there is an open (non-flushed) + * transaction, ALL pending changes will be discarded */ notmuch->xapian_db->close (); } catch (const Xapian::Error &error) { status = NOTMUCH_STATUS_XAPIAN_EXCEPTION;