From: Austin Clements <amdragon@MIT.EDU>
To: notmuch@notmuchmail.org
Cc: Austin Clements <amdragon@mit.edu>
Subject: [PATCH 3/5] Add a generic function to get a list of terms with some prefix.
Date: Thu, 9 Dec 2010 15:59:54 -0500 [thread overview]
Message-ID: <1291928396-27937-4-git-send-email-amdragon@mit.edu> (raw)
In-Reply-To: <1291928396-27937-1-git-send-email-amdragon@mit.edu>
Replace _notmuch_convert_tags with this and simplify
_create_filenames_for_terms_with_prefix. This will also come in handy
shortly to get the message file name list.
---
lib/database-private.h | 16 +++++++---------
lib/database.cc | 36 ++++++++++++++----------------------
lib/directory.cc | 18 +++---------------
lib/message.cc | 6 +++++-
4 files changed, 29 insertions(+), 47 deletions(-)
diff --git a/lib/database-private.h b/lib/database-private.h
index 140b54e..9f83407 100644
--- a/lib/database-private.h
+++ b/lib/database-private.h
@@ -53,18 +53,16 @@ struct _notmuch_database {
Xapian::ValueRangeProcessor *value_range_processor;
};
-/* Convert tags from Xapian internal format to notmuch format.
- *
- * The function gets a TermIterator as argument and uses that iterator to find
- * all tag terms in the object. The tags are then converted to a
- * notmuch_tags_t list and returned. The function needs to allocate memory for
- * the resulting list and it uses the argument ctx as talloc context.
+/* Return the list of terms from the given iterator matching a prefix.
+ * The prefix will be stripped from the strings in the returned list.
+ * The list will be allocated using ctx as the talloc context.
*
* The function returns NULL on failure.
*/
-notmuch_tags_t *
-_notmuch_convert_tags (void *ctx, Xapian::TermIterator &i,
- Xapian::TermIterator &end);
+notmuch_string_list_t *
+_notmuch_get_terms_with_prefix (void *ctx, Xapian::TermIterator &i,
+ Xapian::TermIterator &end,
+ const char *prefix);
#pragma GCC visibility pop
diff --git a/lib/database.cc b/lib/database.cc
index 45613bd..f8245ab 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1747,49 +1747,41 @@ notmuch_database_remove_message (notmuch_database_t *notmuch,
return status;
}
-notmuch_tags_t *
-_notmuch_convert_tags (void *ctx, Xapian::TermIterator &i,
- Xapian::TermIterator &end)
+notmuch_string_list_t *
+_notmuch_get_terms_with_prefix (void *ctx, Xapian::TermIterator &i,
+ Xapian::TermIterator &end,
+ const char *prefix)
{
- const char *prefix = _find_prefix ("tag");
+ int prefix_len = strlen (prefix);
notmuch_string_list_t *list;
- std::string tag;
-
- /* Currently this iteration is written with the assumption that
- * "tag" has a single-character prefix. */
- assert (strlen (prefix) == 1);
list = _notmuch_string_list_create (ctx);
if (unlikely (list == NULL))
return NULL;
- i.skip_to (prefix);
-
- while (i != end) {
- tag = *i;
-
- if (tag.empty () || tag[0] != *prefix)
+ for (i.skip_to (prefix); i != end; i++) {
+ /* Terminate loop at first term without desired prefix. */
+ if (strncmp ((*i).c_str (), prefix, prefix_len))
break;
- _notmuch_string_list_append (list, tag.c_str () + 1);
-
- i++;
+ _notmuch_string_list_append (list, (*i).c_str () + prefix_len);
}
- _notmuch_string_list_sort (list);
-
- return _notmuch_tags_create (ctx, list, TRUE);
+ return list;
}
notmuch_tags_t *
notmuch_database_get_all_tags (notmuch_database_t *db)
{
Xapian::TermIterator i, end;
+ notmuch_string_list_t *tags;
try {
i = db->xapian_db->allterms_begin();
end = db->xapian_db->allterms_end();
- return _notmuch_convert_tags(db, i, end);
+ tags = _notmuch_get_terms_with_prefix (db, i, end, _find_prefix ("tag"));
+ _notmuch_string_list_sort (tags);
+ return _notmuch_tags_create (db, tags, TRUE);
} catch (const Xapian::Error &error) {
fprintf (stderr, "A Xapian exception occurred getting tags: %s.\n",
error.get_msg().c_str());
diff --git a/lib/directory.cc b/lib/directory.cc
index aeee9ca..fb6ef03 100644
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -23,10 +23,6 @@
/* Create an iterator to iterate over the basenames of files (or
* directories) that all share a common parent directory.
- *
- * The code here is general enough to be reused for any case of
- * iterating over the non-prefixed portion of terms sharing a common
- * prefix.
*/
static notmuch_filenames_t *
_create_filenames_for_terms_with_prefix (void *ctx,
@@ -35,21 +31,13 @@ _create_filenames_for_terms_with_prefix (void *ctx,
{
notmuch_string_list_t *filename_list;
Xapian::TermIterator i, end;
- int prefix_len = strlen (prefix);
- filename_list = _notmuch_string_list_create (ctx);
+ i = notmuch->xapian_db->allterms_begin();
+ end = notmuch->xapian_db->allterms_end();
+ filename_list = _notmuch_get_terms_with_prefix (ctx, i, end, prefix);
if (unlikely (filename_list == NULL))
return NULL;
- end = notmuch->xapian_db->allterms_end (prefix);
-
- for (i = notmuch->xapian_db->allterms_begin (prefix); i != end; i++)
- {
- std::string term = *i;
-
- _notmuch_string_list_append (filename_list, term.c_str () + prefix_len);
- }
-
return _notmuch_filenames_create (ctx, filename_list);
}
diff --git a/lib/message.cc b/lib/message.cc
index 031eda5..dbf683c 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -640,9 +640,13 @@ notmuch_tags_t *
notmuch_message_get_tags (notmuch_message_t *message)
{
Xapian::TermIterator i, end;
+ notmuch_string_list_t *tags;
i = message->doc.termlist_begin();
end = message->doc.termlist_end();
- return _notmuch_convert_tags(message, i, end);
+ tags = _notmuch_get_terms_with_prefix (message, i, end,
+ _find_prefix ("tag"));
+ _notmuch_string_list_sort (tags);
+ return _notmuch_tags_create (message, tags, TRUE);
}
const char *
--
1.7.2.3
next prev parent reply other threads:[~2010-12-09 21:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-09 20:59 [PATCH 0/5] Fetch all message metadata in a single pass Austin Clements
2010-12-09 20:59 ` [PATCH 1/5] Use a single unified pass to fetch scalar message metadata Austin Clements
2010-12-09 20:59 ` [PATCH 2/5] Implement an internal generic string list and use it Austin Clements
2010-12-23 2:44 ` Austin Clements
2010-12-09 20:59 ` Austin Clements [this message]
2010-12-09 20:59 ` [PATCH 4/5] Add the file name list to the unified message metadata pass Austin Clements
2010-12-09 20:59 ` [PATCH 5/5] Add the tag " Austin Clements
2011-02-13 20:25 ` [PATCH 0/5] Fetch all message metadata in a single pass Austin Clements
2011-03-11 3:48 ` Carl Worth
2011-03-21 6:56 ` Austin Clements
2011-04-25 20:52 ` Carl Worth
2011-04-25 21:42 ` Carl Worth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1291928396-27937-4-git-send-email-amdragon@mit.edu \
--to=amdragon@mit.edu \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).