From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id qA8TDXwNRWAHagAA0tVLHw (envelope-from ) for ; Sun, 07 Mar 2021 17:29:32 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id Pb3gCHwNRWAvWAAA1q6Kng (envelope-from ) for ; Sun, 07 Mar 2021 17:29:32 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DBC20149F8 for ; Sun, 7 Mar 2021 18:29:31 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 0F44B28E28; Sun, 7 Mar 2021 12:28:33 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 0D89727D48 for ; Sun, 7 Mar 2021 12:28:00 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 074B45FA96; Sun, 7 Mar 2021 12:27:59 -0500 (EST) Received: (nullmailer pid 1091637 invoked by uid 1000); Sun, 07 Mar 2021 17:27:38 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 03/22] lib: save path of xapian database in notmuch struct. Date: Sun, 7 Mar 2021 13:27:15 -0400 Message-Id: <20210307172734.1091264-4-david@tethera.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210307172734.1091264-1-david@tethera.net> References: <20210307172734.1091264-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: VVTC72BULQINN3NY35355VMOLM4L52YF X-Message-ID-Hash: VVTC72BULQINN3NY35355VMOLM4L52YF X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615138172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=iVuxnsxBy7MoeLw+trs9wUDFbuQdJhRsCC/n3RaEc8c=; b=FcFdEf8q3CxrmJK3hZLAIdbeaXL9acAg9BQ5bcrWfGDz7AixCXRVMf3kgYj56rzDFuZV3k i/Os1xANtwi3DpSq8f99bZBzJEKKgQ/6kcNcoGjN7Kp4njOqUOi5MpKd55sA6/PhNe00ek wVaiYX4c6Pz7j3mMi5yFG0YBS6KjUY/+6rarA6+hbbFK7NsKmyEnRcLs4o3Qk2xjfsQ7cx KgPH+BEmKwtEroxPZdiKHqbC3fdET0IqtBWTt2avoBG+c0n45WvJX7bXzeKypvArpDHqfa TQUrOji0pkbfmiQKF+rwu5Ypduq/VLwIf0fHbEAsK3mlpgfJA4P0cMPrKeLDsA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615138172; a=rsa-sha256; cv=none; b=DCiasyS/Rwm3UidWTgh2k4gmsBrZLz6foFsm8lXzyL2qdmInHANEvBPkNyY9r2ALR9iWJv 11sjah/a1x0rP2zvHoo6KYoYR2Ia06yLsOCvgYEilFlO+eNUelqrDF5HHEeIzTy8ZKyOLs fMAE5GRKaDlNcOXbEyHIb9AVDqmYfBxv47OgjSr2VGqhXNOfjvXo3FKPvgavHatNRA4kXJ gH7uVQ4X1Vp1WOvskpixd7jx9lSOhockwFdehvg1B1NAi4Q1oP/bdc9/Wv71fQpsrFoKQT twdADJurA3yFKVA99f0L1WWhDuTPNRq/j9wK8aqLLJDLuiGsFh55A88vvSNSeg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.86 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: DBC20149F8 X-Spam-Score: -0.86 X-Migadu-Scanner: scn1.migadu.com X-TUID: Ob/Cywod9lOL This will allow re-opening in a different mode (read/write vs. read-only) with current Xapian API. --- lib/database-private.h | 4 ++++ lib/open.cc | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/database-private.h b/lib/database-private.h index d83cf0d0..d936b216 100644 --- a/lib/database-private.h +++ b/lib/database-private.h @@ -189,8 +189,12 @@ operator& (notmuch_field_flag_t a, notmuch_field_flag_t b) struct _notmuch_database { bool exception_reported; + /* Path to database parent directory and or/mail root */ char *path; + /* Path to actual database */ + const char *xapian_path; + int atomic_nesting; /* true if changes have been made in this atomic section */ bool atomic_dirty; diff --git a/lib/open.cc b/lib/open.cc index 5336a93f..c9cb78e6 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -199,7 +199,7 @@ notmuch_database_open_with_config (const char *database_path, notmuch_status_t status = NOTMUCH_STATUS_SUCCESS; void *local = talloc_new (NULL); notmuch_database_t *notmuch = NULL; - char *notmuch_path, *xapian_path, *incompat_features; + char *notmuch_path, *incompat_features; char *message = NULL; struct stat st; int err; @@ -225,12 +225,6 @@ notmuch_database_open_with_config (const char *database_path, goto DONE; } - if (! (xapian_path = talloc_asprintf (local, "%s/%s", notmuch_path, "xapian"))) { - message = strdup ("Out of memory\n"); - status = NOTMUCH_STATUS_OUT_OF_MEMORY; - goto DONE; - } - /* Initialize the GLib type system and threads */ #if ! GLIB_CHECK_VERSION (2, 35, 1) g_type_init (); @@ -252,16 +246,23 @@ notmuch_database_open_with_config (const char *database_path, notmuch->writable_xapian_db = NULL; notmuch->atomic_nesting = 0; notmuch->view = 1; + + if (! (notmuch->xapian_path = talloc_asprintf (notmuch, "%s/%s", notmuch_path, "xapian"))) { + message = strdup ("Out of memory\n"); + status = NOTMUCH_STATUS_OUT_OF_MEMORY; + goto DONE; + } + try { std::string last_thread_id; std::string last_mod; if (mode == NOTMUCH_DATABASE_MODE_READ_WRITE) { - notmuch->writable_xapian_db = new Xapian::WritableDatabase (xapian_path, + notmuch->writable_xapian_db = new Xapian::WritableDatabase (notmuch->xapian_path, DB_ACTION); notmuch->xapian_db = notmuch->writable_xapian_db; } else { - notmuch->xapian_db = new Xapian::Database (xapian_path); + notmuch->xapian_db = new Xapian::Database (notmuch->xapian_path); } /* Check version. As of database version 3, we represent -- 2.30.1