From: Austin Clements <amdragon@MIT.EDU>
To: Carl Worth <cworth@cworth.org>
Cc: notmuch@notmuchmail.org
Subject: [PATCH] Various small clean-ups to doc ID set code.
Date: Wed, 8 Dec 2010 17:01:53 -0500 [thread overview]
Message-ID: <20101208220153.GT2447@mit.edu> (raw)
In-Reply-To: <20101208215844.GS2447@mit.edu>
Remove the repeated "sizeof (doc_ids->bitmap[0])" that bothered cworth
by instead defining macros to compute the word and bit offset of a
given bit in the bitmap.
Don't require the caller of _notmuch_doc_id_set_init to pass in a
correct bound; instead compute it from the array. This simplifies the
caller and makes this interface easier to use correctly.
---
lib/query.cc | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/lib/query.cc b/lib/query.cc
index c7ae4ee..3b76dc5 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -38,9 +38,12 @@ typedef struct _notmuch_mset_messages {
struct _notmuch_doc_id_set {
unsigned int *bitmap;
- unsigned int bound;
+ unsigned int max;
};
+#define BITMAP_WORD(bit) ((bit) / sizeof (unsigned int))
+#define BITMAP_BIT(bit) ((bit) % sizeof (unsigned int))
+
struct _notmuch_threads {
notmuch_query_t *query;
@@ -257,22 +260,24 @@ _notmuch_mset_messages_move_to_next (notmuch_messages_t *messages)
static notmuch_bool_t
_notmuch_doc_id_set_init (void *ctx,
notmuch_doc_id_set_t *doc_ids,
- GArray *arr, unsigned int bound)
+ GArray *arr)
{
- size_t count = (bound + sizeof (doc_ids->bitmap[0]) - 1) /
- sizeof (doc_ids->bitmap[0]);
- unsigned int *bitmap = talloc_zero_array (ctx, unsigned int, count);
+ unsigned int max = 0;
+ unsigned int *bitmap;
+
+ for (unsigned int i = 0; i < arr->len; i++)
+ max = MAX(max, g_array_index (arr, unsigned int, i));
+ bitmap = talloc_zero_array (ctx, unsigned int, 1 + max / sizeof (*bitmap));
if (bitmap == NULL)
return FALSE;
doc_ids->bitmap = bitmap;
- doc_ids->bound = bound;
+ doc_ids->max = max;
for (unsigned int i = 0; i < arr->len; i++) {
- unsigned int doc_id = g_array_index(arr, unsigned int, i);
- bitmap[doc_id / sizeof (bitmap[0])] |=
- 1 << (doc_id % sizeof (bitmap[0]));
+ unsigned int doc_id = g_array_index (arr, unsigned int, i);
+ bitmap[BITMAP_WORD(doc_id)] |= 1 << BITMAP_BIT(doc_id);
}
return TRUE;
@@ -282,19 +287,17 @@ notmuch_bool_t
_notmuch_doc_id_set_contains (notmuch_doc_id_set_t *doc_ids,
unsigned int doc_id)
{
- if (doc_id >= doc_ids->bound)
+ if (doc_id > doc_ids->max)
return FALSE;
- return (doc_ids->bitmap[doc_id / sizeof (doc_ids->bitmap[0])] &
- (1 << (doc_id % sizeof (doc_ids->bitmap[0])))) != 0;
+ return doc_ids->bitmap[BITMAP_WORD(doc_id)] & (1 << BITMAP_BIT(doc_id));
}
void
_notmuch_doc_id_set_remove (notmuch_doc_id_set_t *doc_ids,
unsigned int doc_id)
{
- if (doc_id < doc_ids->bound)
- doc_ids->bitmap[doc_id / sizeof (doc_ids->bitmap[0])] &=
- ~(1 << (doc_id % sizeof (doc_ids->bitmap[0])));
+ if (doc_id <= doc_ids->max)
+ doc_ids->bitmap[BITMAP_WORD(doc_id)] &= ~(1 << BITMAP_BIT(doc_id));
}
/* Glib objects force use to use a talloc destructor as well, (but not
@@ -315,7 +318,6 @@ notmuch_query_search_threads (notmuch_query_t *query)
{
notmuch_threads_t *threads;
notmuch_messages_t *messages;
- Xapian::docid max_doc_id = 0;
threads = talloc (query, notmuch_threads_t);
if (threads == NULL)
@@ -335,7 +337,6 @@ notmuch_query_search_threads (notmuch_query_t *query)
while (notmuch_messages_valid (messages)) {
unsigned int doc_id = _notmuch_mset_messages_get_doc_id (messages);
g_array_append_val (threads->doc_ids, doc_id);
- max_doc_id = MAX (max_doc_id, doc_id);
notmuch_messages_move_to_next (messages);
}
threads->doc_id_pos = 0;
@@ -343,7 +344,7 @@ notmuch_query_search_threads (notmuch_query_t *query)
talloc_free (messages);
if (! _notmuch_doc_id_set_init (threads, &threads->match_set,
- threads->doc_ids, max_doc_id + 1)) {
+ threads->doc_ids)) {
talloc_free (threads);
return NULL;
}
--
1.7.2.3
next prev parent reply other threads:[~2010-12-08 22:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-17 19:28 [PATCH 3/4] Optimize thread search using matched docid sets Austin Clements
2010-11-18 7:38 ` Austin Clements
2010-12-08 1:20 ` Carl Worth
2010-12-08 1:19 ` Carl Worth
2010-12-08 21:58 ` Austin Clements
2010-12-08 22:01 ` Austin Clements [this message]
2011-01-28 21:36 ` [PATCH] Various small clean-ups to doc ID set code Carl Worth
2011-01-31 4:22 ` [PATCH v2 0/2] Small clean-ups to the " Austin Clements
2011-03-09 23:21 ` Carl Worth
2011-03-10 1:31 ` Austin Clements
2011-01-31 4:22 ` [PATCH 1/2] Remove code repetition in the doc ID bitmap code Austin Clements
2011-01-31 4:22 ` [PATCH 2/2] Simplify _notmuch_doc_id_set_init interface Austin Clements
2011-01-28 21:26 ` [PATCH 3/4] Optimize thread search using matched docid sets 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=20101208220153.GT2447@mit.edu \
--to=amdragon@mit.edu \
--cc=cworth@cworth.org \
--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).