From 520fd978be3841c0d6e96d0c14459e5a29eb9b7a Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sat, 4 Oct 2014 10:19:13 +2000 Subject: [PATCH] [PATCH 06/11] lib: Internal support for querying and creating ghost messages --- 58/74b4abd6803239a5ec70af9d90234fd5014637 | 247 ++++++++++++++++++++++ 1 file changed, 247 insertions(+) create mode 100644 58/74b4abd6803239a5ec70af9d90234fd5014637 diff --git a/58/74b4abd6803239a5ec70af9d90234fd5014637 b/58/74b4abd6803239a5ec70af9d90234fd5014637 new file mode 100644 index 000000000..3d42a7a2c --- /dev/null +++ b/58/74b4abd6803239a5ec70af9d90234fd5014637 @@ -0,0 +1,247 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 1EBCC431E82 + for ; Fri, 3 Oct 2014 07:19:40 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 4gEjBGQh7oQK for ; + Fri, 3 Oct 2014 07:19:32 -0700 (PDT) +Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu + [18.7.68.37]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 8F6D5431FC9 + for ; Fri, 3 Oct 2014 07:19:25 -0700 (PDT) +X-AuditID: 12074425-f79e46d000002583-2c-542eb06c3630 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + (using TLS with cipher AES256-SHA (256/256 bits)) + (Client did not present a certificate) + by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP + id DF.18.09603.C60BE245; Fri, 3 Oct 2014 10:19:24 -0400 (EDT) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s93EJN7I020195; + Fri, 3 Oct 2014 10:19:23 -0400 +Received: from drake.dyndns.org + (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [216.15.114.40]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s93EJL1w023316 + (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); + Fri, 3 Oct 2014 10:19:22 -0400 +Received: from amthrax by drake.dyndns.org with local (Exim 4.84) + (envelope-from ) + id 1Xa3hZ-0002Jx-6n; Fri, 03 Oct 2014 10:19:21 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 06/11] lib: Internal support for querying and creating ghost + messages +Date: Fri, 3 Oct 2014 10:19:13 -0400 +Message-Id: <1412345958-8278-7-git-send-email-aclements@csail.mit.edu> +X-Mailer: git-send-email 2.1.0 +In-Reply-To: <1412345958-8278-1-git-send-email-aclements@csail.mit.edu> +References: <1412345958-8278-1-git-send-email-aclements@csail.mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixG6nrpuzQS/E4Np2M4vrN2cyOzB6PFt1 + izmAMYrLJiU1J7MstUjfLoErY17jNsaCa/oVX39tZmlgnKfWxcjBISFgIrF1uW4XIyeQKSZx + 4d56ti5GLg4hgdlMEjNer2WEcDYwSsy5N4UdpEpI4DaTxLNj4hCJJYwSXw6vYANJsAnoS6xY + O4kVxBYRkJbYeXc2K8gGZgE1iT9dKiBhYYFQidnrW5hAbBYBVYn9N+6zgNi8Am4SEybuZIK4 + Qk5iw+7/jCA2p4C7xIW7T9kg9rpJrDrWzTaBkX8BI8MqRtmU3Crd3MTMnOLUZN3i5MS8vNQi + XQu93MwSvdSU0k2M4JBxUd3BOOGQ0iFGAQ5GJR7ejzd0Q4RYE8uKK3MPMUpyMCmJ8lYu1gsR + 4kvKT6nMSCzOiC8qzUktPsQowcGsJMK7YCVQjjclsbIqtSgfJiXNwaIkzrvpB1+IkEB6Yklq + dmpqQWoRTFaGg0NJgpcLGBtCgkWp6akVaZk5JQhpJg5OkOE8QMPb14MMLy5IzC3OTIfIn2JU + lBLnFQVpFgBJZJTmwfXCYvoVozjQK8K8TCBVPMB0ANf9CmgwE9Dgd/a6IINLEhFSUg2M1ptm + vU+PPv17dvO764rvWwqeNf7Tq5E+7yO3/qvvw+R7k8tWbrZ+1bW0TZ7742l75fkzwhmfn322 + 4UCuZcqnN23W7IVm0+QlWnRvZT3oLb7/7e/Bjz/ee/d0FfP8lPkm0tQ0T1LgDdvs6UVy02RZ + HE9uD21+37Ls2+roI97clTLb5+3RszDqUmIpzkg01GIuKk4EAMvTMAvEAgAA +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +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, 03 Oct 2014 14:19:40 -0000 + +From: Austin Clements + +This updates the message abstraction to support ghost messages: it +adds a message flag that distinguishes regular messages from ghost +messages, and an internal function for initializing a newly created +(blank) message as a ghost message. +--- + lib/message.cc | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- + lib/notmuch-private.h | 4 ++++ + lib/notmuch.h | 9 ++++++++- + 3 files changed, 60 insertions(+), 3 deletions(-) + +diff --git a/lib/message.cc b/lib/message.cc +index 38bc929..ad832cf 100644 +--- a/lib/message.cc ++++ b/lib/message.cc +@@ -39,6 +39,9 @@ struct visible _notmuch_message { + notmuch_message_file_t *message_file; + notmuch_message_list_t *replies; + unsigned long flags; ++ /* For flags that are initialized on-demand, lazy_flags indicates ++ * if each flag has been initialized. */ ++ unsigned long lazy_flags; + + Xapian::Document doc; + Xapian::termcount termpos; +@@ -99,6 +102,7 @@ _notmuch_message_create_for_document (const void *talloc_owner, + + message->frozen = 0; + message->flags = 0; ++ message->lazy_flags = 0; + + /* Each of these will be lazily created as needed. */ + message->message_id = NULL; +@@ -192,7 +196,7 @@ _notmuch_message_create (const void *talloc_owner, + * + * There is already a document with message ID 'message_id' in the + * database. The returned message can be used to query/modify the +- * document. ++ * document. The message may be a ghost message. + * + * NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND: + * +@@ -305,6 +309,7 @@ _notmuch_message_ensure_metadata (notmuch_message_t *message) + const char *thread_prefix = _find_prefix ("thread"), + *tag_prefix = _find_prefix ("tag"), + *id_prefix = _find_prefix ("id"), ++ *type_prefix = _find_prefix ("type"), + *filename_prefix = _find_prefix ("file-direntry"), + *replyto_prefix = _find_prefix ("replyto"); + +@@ -337,10 +342,23 @@ _notmuch_message_ensure_metadata (notmuch_message_t *message) + message->message_id = + _notmuch_message_get_term (message, i, end, id_prefix); + ++ /* Get document type */ ++ assert (strcmp (id_prefix, type_prefix) < 0); ++ if (! (message->lazy_flags & (1 << NOTMUCH_MESSAGE_FLAG_GHOST))) { ++ i.skip_to (type_prefix); ++ if (*i == "Tmail") ++ message->flags &= ~(1 << NOTMUCH_MESSAGE_FLAG_GHOST); ++ else if (*i == "Tghost") ++ message->flags |= (1 << NOTMUCH_MESSAGE_FLAG_GHOST); ++ else ++ INTERNAL_ERROR ("Message without type term"); ++ message->lazy_flags |= (1 << NOTMUCH_MESSAGE_FLAG_GHOST); ++ } ++ + /* Get filename list. Here we get only the terms. We lazily + * expand them to full file names when needed in + * _notmuch_message_ensure_filename_list. */ +- assert (strcmp (id_prefix, filename_prefix) < 0); ++ assert (strcmp (type_prefix, filename_prefix) < 0); + if (!message->filename_term_list && !message->filename_list) + message->filename_term_list = + _notmuch_database_get_terms_with_prefix (message, i, end, +@@ -371,6 +389,11 @@ _notmuch_message_invalidate_metadata (notmuch_message_t *message, + message->tag_list = NULL; + } + ++ if (strcmp ("type", prefix_name) == 0) { ++ message->flags &= ~(1 << NOTMUCH_MESSAGE_FLAG_GHOST); ++ message->lazy_flags &= ~(1 << NOTMUCH_MESSAGE_FLAG_GHOST); ++ } ++ + if (strcmp ("file-direntry", prefix_name) == 0) { + talloc_free (message->filename_term_list); + talloc_free (message->filename_list); +@@ -869,6 +892,10 @@ notmuch_bool_t + notmuch_message_get_flag (notmuch_message_t *message, + notmuch_message_flag_t flag) + { ++ if (flag == NOTMUCH_MESSAGE_FLAG_GHOST && ++ ! (message->lazy_flags & (1 << flag))) ++ _notmuch_message_ensure_metadata (message); ++ + return message->flags & (1 << flag); + } + +@@ -880,6 +907,7 @@ notmuch_message_set_flag (notmuch_message_t *message, + message->flags |= (1 << flag); + else + message->flags &= ~(1 << flag); ++ message->lazy_flags |= (1 << flag); + } + + time_t +@@ -989,6 +1017,24 @@ _notmuch_message_delete (notmuch_message_t *message) + return NOTMUCH_STATUS_SUCCESS; + } + ++/* Transform a blank message into a ghost message. The caller must ++ * _notmuch_message_sync the message. */ ++notmuch_private_status_t ++_notmuch_message_initialize_ghost (notmuch_message_t *message, ++ const char *thread_id) ++{ ++ notmuch_private_status_t status; ++ ++ status = _notmuch_message_add_term (message, "type", "ghost"); ++ if (status) ++ return status; ++ status = _notmuch_message_add_term (message, "thread", thread_id); ++ if (status) ++ return status; ++ ++ return NOTMUCH_PRIVATE_STATUS_SUCCESS; ++} ++ + /* Ensure that 'message' is not holding any file object open. Future + * calls to various functions will still automatically open the + * message file as needed. +diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h +index 36cc12b..2fbd38e 100644 +--- a/lib/notmuch-private.h ++++ b/lib/notmuch-private.h +@@ -297,6 +297,10 @@ _notmuch_message_sync (notmuch_message_t *message); + notmuch_status_t + _notmuch_message_delete (notmuch_message_t *message); + ++notmuch_private_status_t ++_notmuch_message_initialize_ghost (notmuch_message_t *message, ++ const char *thread_id); ++ + void + _notmuch_message_close (notmuch_message_t *message); + +diff --git a/lib/notmuch.h b/lib/notmuch.h +index dae0416..92594b9 100644 +--- a/lib/notmuch.h ++++ b/lib/notmuch.h +@@ -1221,7 +1221,14 @@ notmuch_message_get_filenames (notmuch_message_t *message); + */ + typedef enum _notmuch_message_flag { + NOTMUCH_MESSAGE_FLAG_MATCH, +- NOTMUCH_MESSAGE_FLAG_EXCLUDED ++ NOTMUCH_MESSAGE_FLAG_EXCLUDED, ++ ++ /* This message is a "ghost message", meaning it has no filenames ++ * or content, but we know it exists because it was referenced by ++ * some other message. A ghost message has only a message ID and ++ * thread ID. ++ */ ++ NOTMUCH_MESSAGE_FLAG_GHOST, + } notmuch_message_flag_t; + + /** +-- +2.1.0 + -- 2.26.2