X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=ec%2Fe6bd54ffeb769232c61ce30562a3dd0dff9d3f;fp=ec%2Fe6bd54ffeb769232c61ce30562a3dd0dff9d3f;h=55424e0d4923ce21ca4fc19d61c70afd0ede6f48;hb=c9b80453c41a4c361a47929e4126f959473128a0;hp=0000000000000000000000000000000000000000;hpb=83583b5a9844e0cfbc52cdc178abd74cf8325d7c;p=notmuch-archives.git diff --git a/ec/e6bd54ffeb769232c61ce30562a3dd0dff9d3f b/ec/e6bd54ffeb769232c61ce30562a3dd0dff9d3f new file mode 100644 index 000000000..55424e0d4 --- /dev/null +++ b/ec/e6bd54ffeb769232c61ce30562a3dd0dff9d3f @@ -0,0 +1,193 @@ +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 51BA76DE190D + for ; Fri, 14 Aug 2015 09:49:48 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.133 +X-Spam-Level: +X-Spam-Status: No, score=0.133 tagged_above=-999 required=5 tests=[AWL=0.123, + T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] 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 WirKary7O57x for ; + Fri, 14 Aug 2015 09:49:42 -0700 (PDT) +Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224]) + by arlo.cworth.org (Postfix) with ESMTPS id BF26E6DE1A2D + for ; Fri, 14 Aug 2015 09:49:38 -0700 (PDT) +Received: from remotemail by gitolite.debian.net with local (Exim 4.80) + (envelope-from ) + id 1ZQIA4-0003eK-KZ; Fri, 14 Aug 2015 16:48:56 +0000 +Received: (nullmailer pid 15754 invoked by uid 1000); Fri, 14 Aug 2015 + 16:48:02 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH 2/5] lib: API to retrieve database revision and UUID +Date: Fri, 14 Aug 2015 18:47:55 +0200 +Message-Id: <1439570878-15165-3-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.5.0 +In-Reply-To: <1439570878-15165-1-git-send-email-david@tethera.net> +References: <1439570878-15165-1-git-send-email-david@tethera.net> +Cc: Austin Clements +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.18 +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: Fri, 14 Aug 2015 16:49:48 -0000 + +From: Austin Clements + +This exposes the committed database revision to library users along +with a UUID that can be used to detect when revision numbers are no +longer comparable (e.g., because the database has been replaced). +--- + lib/database-private.h | 1 + + lib/database.cc | 11 +++++++++++ + lib/notmuch.h | 18 ++++++++++++++++++ + test/T570-revision-tracking.sh | 37 +++++++++++++++++++++++++++++++++++++ + test/test-lib.sh | 5 +++++ + 5 files changed, 72 insertions(+) + create mode 100755 test/T570-revision-tracking.sh + +diff --git a/lib/database-private.h b/lib/database-private.h +index 5c5a2bb..4e93257 100644 +--- a/lib/database-private.h ++++ b/lib/database-private.h +@@ -170,6 +170,7 @@ struct _notmuch_database { + * under a higher revision number, which can be generated with + * notmuch_database_new_revision. */ + unsigned long revision; ++ const char *uuid; + + Xapian::QueryParser *query_parser; + Xapian::TermGenerator *term_gen; +diff --git a/lib/database.cc b/lib/database.cc +index 52e2e8f..fc78769 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -992,6 +992,8 @@ notmuch_database_open_verbose (const char *path, + notmuch->revision = 0; + else + notmuch->revision = Xapian::sortable_unserialise (last_mod); ++ notmuch->uuid = talloc_strdup ( ++ notmuch, notmuch->xapian_db->get_uuid ().c_str ()); + + notmuch->query_parser = new Xapian::QueryParser; + notmuch->term_gen = new Xapian::TermGenerator; +@@ -1666,6 +1668,15 @@ DONE: + return NOTMUCH_STATUS_SUCCESS; + } + ++unsigned long ++notmuch_database_get_revision (notmuch_database_t *notmuch, ++ const char **uuid) ++{ ++ if (uuid) ++ *uuid = notmuch->uuid; ++ return notmuch->revision; ++} ++ + /* We allow the user to use arbitrarily long paths for directories. But + * we have a term-length limit. So if we exceed that, we'll use the + * SHA-1 of the path for the database term. +diff --git a/lib/notmuch.h b/lib/notmuch.h +index b1f5bfa..8639b38 100644 +--- a/lib/notmuch.h ++++ b/lib/notmuch.h +@@ -468,6 +468,24 @@ notmuch_status_t + notmuch_database_end_atomic (notmuch_database_t *notmuch); + + /** ++ * Return the committed database revision and UUID. ++ * ++ * The database revision number increases monotonically with each ++ * commit to the database. Hence, all messages and message changes ++ * committed to the database (that is, visible to readers) have a last ++ * modification revision <= the committed database revision. Any ++ * messages committed in the future will be assigned a modification ++ * revision > the committed database revision. ++ * ++ * The UUID is a NUL-terminated opaque string that uniquely identifies ++ * this database. Two revision numbers are only comparable if they ++ * have the same database UUID. ++ */ ++unsigned long ++notmuch_database_get_revision (notmuch_database_t *notmuch, ++ const char **uuid); ++ ++/** + * Retrieve a directory object from the database for 'path'. + * + * Here, 'path' should be a path relative to the path of 'database' +diff --git a/test/T570-revision-tracking.sh b/test/T570-revision-tracking.sh +new file mode 100755 +index 0000000..e0a5703 +--- /dev/null ++++ b/test/T570-revision-tracking.sh +@@ -0,0 +1,37 @@ ++#!/usr/bin/env bash ++test_description="database revision tracking" ++ ++. ./test-lib.sh || exit 1 ++ ++add_email_corpus ++ ++test_begin_subtest "notmuch_database_get_revision" ++test_C ${MAIL_DIR} <<'EOF' ++#include ++#include ++#include ++int main (int argc, char** argv) ++{ ++ notmuch_database_t *db; ++ notmuch_status_t stat; ++ unsigned long revision; ++ const char *uuid; ++ ++ unsigned long rev; ++ ++ stat = notmuch_database_open (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY, &db); ++ if (stat) ++ fputs ("open failed\n", stderr); ++ revision = notmuch_database_get_revision (db, &uuid); ++ printf("%s\t%lu\n", uuid, revision); ++} ++EOF ++notmuch_uuid_sanitize < OUTPUT > CLEAN ++cat <<'EOF' >EXPECTED ++== stdout == ++UUID 53 ++== stderr == ++EOF ++test_expect_equal_file EXPECTED CLEAN ++ ++test_done +diff --git a/test/test-lib.sh b/test/test-lib.sh +index 0bf7163..126911f 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -720,6 +720,11 @@ notmuch_date_sanitize () + sed \ + -e 's/^Date: Fri, 05 Jan 2001 .*0000/Date: GENERATED_DATE/' + } ++ ++notmuch_uuid_sanitize () ++{ ++ sed 's/[0-9a-f]\{8\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{12\}/UUID/g' ++} + # End of notmuch helper functions + + # Use test_set_prereq to tell that a particular prerequisite is available. +-- +2.5.0 +