From a3a3652906ef709fc3921660c4fffc014c024777 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 27 Mar 2016 14:57:16 +2100 Subject: [PATCH] [Patch v2 06/13] lib: provide config API --- 25/7c905c2d89b2c5e2f10b90a9c22108c4f0bb6a | 271 ++++++++++++++++++++++ 1 file changed, 271 insertions(+) create mode 100644 25/7c905c2d89b2c5e2f10b90a9c22108c4f0bb6a diff --git a/25/7c905c2d89b2c5e2f10b90a9c22108c4f0bb6a b/25/7c905c2d89b2c5e2f10b90a9c22108c4f0bb6a new file mode 100644 index 000000000..b3e482f3c --- /dev/null +++ b/25/7c905c2d89b2c5e2f10b90a9c22108c4f0bb6a @@ -0,0 +1,271 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 14E5D6DE0928 + for ; Sat, 26 Mar 2016 11:23:48 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.02 +X-Spam-Level: +X-Spam-Status: No, score=-0.02 tagged_above=-999 required=5 tests=[AWL=-0.021, + HEADER_FROM_DIFFERENT_DOMAINS=0.001] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id OMLIzVo_FuwN for ; + Sat, 26 Mar 2016 11:23:39 -0700 (PDT) +Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) + by arlo.cworth.org (Postfix) with ESMTPS id 465A96DE02CC + for ; Sat, 26 Mar 2016 11:23:20 -0700 (PDT) +Received: from remotemail by fethera.tethera.net with local (Exim 4.84) + (envelope-from ) + id 1ajsTb-0000w8-Mz; Sat, 26 Mar 2016 13:58:19 -0400 +Received: (nullmailer pid 8814 invoked by uid 1000); + Sat, 26 Mar 2016 17:57:27 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [Patch v2 06/13] lib: provide config API +Date: Sat, 26 Mar 2016 14:57:16 -0300 +Message-Id: <1459015043-8460-7-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.6.4 +In-Reply-To: <1459015043-8460-1-git-send-email-david@tethera.net> +References: <1459015043-8460-1-git-send-email-david@tethera.net> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +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: Sat, 26 Mar 2016 18:23:48 -0000 + +This is a thin wrapper around the Xapian metadata API. The job of this +layer is to keep the config key value pairs from colliding with other +metadata by transparently prefixing the keys, along with the usual glue +to provide a C interface. + +The split of _get_config into two functions is to allow returning of the +return value with different memory ownership semantics. +--- + lib/Makefile.local | 1 + + lib/config.cc | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++ + lib/notmuch.h | 20 +++++++++++ + test/T590-libconfig.sh | 58 ++++++++++++++++++++++++++++++++ + 4 files changed, 169 insertions(+) + create mode 100644 lib/config.cc + create mode 100755 test/T590-libconfig.sh + +diff --git a/lib/Makefile.local b/lib/Makefile.local +index 4ad0158..96899bf 100644 +--- a/lib/Makefile.local ++++ b/lib/Makefile.local +@@ -49,6 +49,7 @@ libnotmuch_cxx_srcs = \ + $(dir)/index.cc \ + $(dir)/message.cc \ + $(dir)/query.cc \ ++ $(dir)/config.cc \ + $(dir)/thread.cc + + libnotmuch_modules := $(libnotmuch_c_srcs:.c=.o) $(libnotmuch_cxx_srcs:.cc=.o) +diff --git a/lib/config.cc b/lib/config.cc +new file mode 100644 +index 0000000..af00d6f +--- /dev/null ++++ b/lib/config.cc +@@ -0,0 +1,90 @@ ++/* metadata.cc - API for database metadata ++ * ++ * Copyright © 2015 David Bremner ++ * ++ * This program is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see http://www.gnu.org/licenses/ . ++ * ++ * Author: David Bremner ++ */ ++ ++#include "notmuch.h" ++#include "notmuch-private.h" ++#include "database-private.h" ++ ++static const std::string CONFIG_PREFIX="C"; ++ ++notmuch_status_t ++notmuch_database_set_config (notmuch_database_t *notmuch, ++ const char *key, ++ const char *value) ++{ ++ notmuch_status_t status; ++ Xapian::WritableDatabase *db; ++ ++ status = _notmuch_database_ensure_writable (notmuch); ++ if (status) ++ return status; ++ ++ try { ++ db = static_cast (notmuch->xapian_db); ++ db->set_metadata (CONFIG_PREFIX+key, value); ++ } catch (const Xapian::Error &error) { ++ status = NOTMUCH_STATUS_XAPIAN_EXCEPTION; ++ notmuch->exception_reported = TRUE; ++ if (! notmuch->exception_reported) { ++ _notmuch_database_log (notmuch, "Error: A Xapian exception occurred setting metadata: %s\n", ++ error.get_msg().c_str()); ++ } ++ } ++ return NOTMUCH_STATUS_SUCCESS; ++} ++ ++static notmuch_status_t ++_metadata_value (notmuch_database_t *notmuch, ++ const char *key, ++ std::string &value) ++{ ++ notmuch_status_t status = NOTMUCH_STATUS_SUCCESS; ++ ++ try { ++ value = notmuch->xapian_db->get_metadata (CONFIG_PREFIX+key); ++ } catch (const Xapian::Error &error) { ++ status = NOTMUCH_STATUS_XAPIAN_EXCEPTION; ++ notmuch->exception_reported = TRUE; ++ if (! notmuch->exception_reported) { ++ _notmuch_database_log (notmuch, "Error: A Xapian exception occurred getting metadata: %s\n", ++ error.get_msg().c_str()); ++ } ++ } ++ return status; ++} ++ ++notmuch_status_t ++notmuch_database_get_config (notmuch_database_t *notmuch, ++ const char *key, ++ char **value) { ++ std::string strval; ++ notmuch_status_t status; ++ ++ if (!value) ++ return NOTMUCH_STATUS_NULL_POINTER; ++ ++ status = _metadata_value (notmuch, key, strval); ++ if (status) ++ return status; ++ ++ *value = strdup (strval.c_str ()); ++ ++ return NOTMUCH_STATUS_SUCCESS; ++} +diff --git a/lib/notmuch.h b/lib/notmuch.h +index b29dd5f..e416fb4 100644 +--- a/lib/notmuch.h ++++ b/lib/notmuch.h +@@ -1838,6 +1838,26 @@ notmuch_filenames_move_to_next (notmuch_filenames_t *filenames); + void + notmuch_filenames_destroy (notmuch_filenames_t *filenames); + ++ ++/** ++ * set config 'key' to 'value' ++ * ++ */ ++notmuch_status_t ++notmuch_database_set_config (notmuch_database_t *db, const char *key, const char *value); ++ ++/** ++ * retrieve config item 'key', assign to 'value' ++ * ++ * keys which have not been previously set with n_d_set_config will ++ * return an empty string. ++ * ++ * return value is allocated by malloc and should be freed by the ++ * caller. ++ */ ++notmuch_status_t ++notmuch_database_get_config (notmuch_database_t *db, const char *key, char **value); ++ + typedef enum { + NOTMUCH_OPTION_COMPACT = 1, + NOTMUCH_OPTION_FIELD_PROCESSOR = 2 +diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh +new file mode 100755 +index 0000000..85e4497 +--- /dev/null ++++ b/test/T590-libconfig.sh +@@ -0,0 +1,58 @@ ++#!/usr/bin/env bash ++test_description="library config API" ++ ++. ./test-lib.sh || exit 1 ++ ++add_email_corpus ++ ++cat < c_head ++#include ++#include ++#include ++#include ++ ++void run(int line, notmuch_status_t ret) ++{ ++ if (ret) { ++ fprintf (stderr, "line %d: %s\n", line, ret); ++ exit (1); ++ } ++} ++ ++#define RUN(v) run(__LINE__, v); ++ ++int main (int argc, char** argv) ++{ ++ notmuch_database_t *db; ++ char *val; ++ notmuch_status_t stat; ++ ++ RUN(notmuch_database_open (argv[1], NOTMUCH_DATABASE_MODE_READ_WRITE, &db)); ++ ++EOF ++ ++cat < c_tail ++ RUN(notmuch_database_destroy(db)); ++} ++EOF ++ ++test_begin_subtest "notmuch_database_{set,get}_config" ++cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} ++{ ++ RUN(notmuch_database_set_config (db, "testkey1", "testvalue1")); ++ RUN(notmuch_database_set_config (db, "testkey2", "testvalue2")); ++ RUN(notmuch_database_get_config (db, "testkey1", &val)); ++ printf("testkey1 = %s\n", val); ++ RUN(notmuch_database_get_config (db, "testkey2", &val)); ++ printf("testkey2 = %s\n", val); ++} ++EOF ++cat <<'EOF' >EXPECTED ++== stdout == ++testkey1 = testvalue1 ++testkey2 = testvalue2 ++== stderr == ++EOF ++test_expect_equal_file EXPECTED OUTPUT ++ ++test_done +-- +2.6.4 + -- 2.26.2