X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fdatabase.cc;h=f7f9943f8a5ac6e03e90c40640b9198d95a2b8cf;hp=2c90019cbee8922bfe9c88541a8aae809c2d6a0f;hb=9257622da8ed50502e59adec69e5daa043ef242a;hpb=3e4ab913db33991177f8da7ae2d6ce7d11791678 diff --git a/lib/database.cc b/lib/database.cc index 2c90019c..f7f9943f 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -37,7 +37,7 @@ typedef struct { /* Here's the current schema for our database: * - * We currently have two different types of documents: mail and timestamps. + * We currently have two different types of documents: mail and directory. * * Mail document * ------------- @@ -75,21 +75,22 @@ typedef struct { * user in searching. But the database doesn't really care itself * about any of these. * - * Timestamp document + * Finally, the data portion of a mail document contains the path name + * of the mail message (relative to the database path). + * + * Directory document * ------------------ - * A timestamp document is used by a client of the notmuch library to + * A directory document is used by a client of the notmuch library to * maintain data necessary to allow for efficient polling of mail - * directories. The notmuch library does no interpretation of - * timestamps, but merely allows the user to store and retrieve - * timestamps as name/value pairs. + * directories. * - * The timestamp document is indexed with a single prefixed term: + * The directory document is indexed with a single prefixed term: * - * timestamp: The user's key value (likely a directory name) + * directory: The directory path (an absolute path) * * and has a single value: * - * TIMESTAMP: The time_t value from the user. + * TIMESTAMP: The mtime of the directory (at last scan) */ /* With these prefix values we follow the conventions published here: @@ -111,7 +112,8 @@ prefix_t BOOLEAN_PREFIX_INTERNAL[] = { { "type", "T" }, { "reference", "XREFERENCE" }, { "replyto", "XREPLYTO" }, - { "timestamp", "XTIMESTAMP" }, + /* XXX: Need a flag day to rename XTIMESTAMP. */ + { "directory", "XTIMESTAMP" }, }; prefix_t BOOLEAN_PREFIX_EXTERNAL[] = { @@ -501,11 +503,13 @@ notmuch_database_open (const char *path, notmuch->query_parser = new Xapian::QueryParser; notmuch->term_gen = new Xapian::TermGenerator; notmuch->term_gen->set_stemmer (Xapian::Stem ("english")); + notmuch->value_range_processor = new Xapian::NumberValueRangeProcessor (NOTMUCH_VALUE_TIMESTAMP); notmuch->query_parser->set_default_op (Xapian::Query::OP_AND); notmuch->query_parser->set_database (*notmuch->xapian_db); notmuch->query_parser->set_stemmer (Xapian::Stem ("english")); notmuch->query_parser->set_stemming_strategy (Xapian::QueryParser::STEM_SOME); + notmuch->query_parser->add_valuerangeprocessor (notmuch->value_range_processor); for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_EXTERNAL); i++) { prefix_t *prefix = &BOOLEAN_PREFIX_EXTERNAL[i]; @@ -548,6 +552,7 @@ notmuch_database_close (notmuch_database_t *notmuch) delete notmuch->term_gen; delete notmuch->query_parser; delete notmuch->xapian_db; + delete notmuch->value_range_processor; talloc_free (notmuch); } @@ -558,42 +563,76 @@ notmuch_database_get_path (notmuch_database_t *notmuch) } static notmuch_private_status_t -find_timestamp_document (notmuch_database_t *notmuch, const char *db_key, +find_directory_document (notmuch_database_t *notmuch, const char *db_path, Xapian::Document *doc, unsigned int *doc_id) { - return find_unique_document (notmuch, "timestamp", db_key, doc, doc_id); + return find_unique_document (notmuch, "directory", db_path, doc, doc_id); } -/* We allow the user to use arbitrarily long keys for timestamps, - * (they're for filesystem paths after all, which have no limit we - * know about). But we have a term-length limit. So if we exceed that, - * we'll use the SHA-1 of the user's key as the actual key for - * constructing a database term. +/* 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. * - * Caution: This function returns a newly allocated string which the - * caller should free() when finished. + * Note: This function may return the original value of 'path'. If it + * does not, then the caller is responsible to free() the returned + * value. */ -static char * -timestamp_db_key (const char *key) +static const char * +directory_db_path (const char *path) { - int term_len = strlen (_find_prefix ("timestamp")) + strlen (key); + int term_len = strlen (_find_prefix ("directory")) + strlen (path); if (term_len > NOTMUCH_TERM_MAX) - return notmuch_sha1_of_string (key); + return notmuch_sha1_of_string (path); else - return strdup (key); + return path; +} + +/* Given a legal 'path' for the database, return the relative path. + * + * The return value will be a pointer to the originl path contents, + * and will be either the original string (if 'path' was relative) or + * a portion of the string (if path was absolute and begins with the + * database path). + */ +const char * +_notmuch_database_relative_path (notmuch_database_t *notmuch, + const char *path) +{ + const char *db_path, *relative; + unsigned int db_path_len; + + db_path = notmuch_database_get_path (notmuch); + db_path_len = strlen (db_path); + + relative = path; + + if (*relative == '/') { + while (*relative == '/' && *(relative+1) == '/') + relative++; + + if (strncmp (relative, db_path, db_path_len) == 0) + { + relative += db_path_len; + while (*relative == '/') + relative++; + } + } + + return relative; } notmuch_status_t -notmuch_database_set_timestamp (notmuch_database_t *notmuch, - const char *key, time_t timestamp) +notmuch_database_set_directory_mtime (notmuch_database_t *notmuch, + const char *path, + time_t mtime) { Xapian::Document doc; Xapian::WritableDatabase *db; unsigned int doc_id; notmuch_private_status_t status; notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; - char *db_key = NULL; + const char *db_path = NULL; if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) { fprintf (stderr, "Attempted to update a read-only database.\n"); @@ -601,17 +640,17 @@ notmuch_database_set_timestamp (notmuch_database_t *notmuch, } db = static_cast (notmuch->xapian_db); - db_key = timestamp_db_key (key); + db_path = directory_db_path (path); try { - status = find_timestamp_document (notmuch, db_key, &doc, &doc_id); + status = find_directory_document (notmuch, db_path, &doc, &doc_id); doc.add_value (NOTMUCH_VALUE_TIMESTAMP, - Xapian::sortable_serialise (timestamp)); + Xapian::sortable_serialise (mtime)); if (status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) { char *term = talloc_asprintf (NULL, "%s%s", - _find_prefix ("timestamp"), db_key); + _find_prefix ("directory"), db_path); doc.add_term (term); talloc_free (term); @@ -621,31 +660,32 @@ notmuch_database_set_timestamp (notmuch_database_t *notmuch, } } catch (const Xapian::Error &error) { - fprintf (stderr, "A Xapian exception occurred setting timestamp: %s.\n", + fprintf (stderr, "A Xapian exception occurred setting directory mtime: %s.\n", error.get_msg().c_str()); notmuch->exception_reported = TRUE; ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION; } - if (db_key) - free (db_key); + if (db_path != path) + free ((char *) db_path); return ret; } time_t -notmuch_database_get_timestamp (notmuch_database_t *notmuch, const char *key) +notmuch_database_get_directory_mtime (notmuch_database_t *notmuch, + const char *path) { Xapian::Document doc; unsigned int doc_id; notmuch_private_status_t status; - char *db_key = NULL; + const char *db_path = NULL; time_t ret = 0; - db_key = timestamp_db_key (key); + db_path = directory_db_path (path); try { - status = find_timestamp_document (notmuch, db_key, &doc, &doc_id); + status = find_directory_document (notmuch, db_path, &doc, &doc_id); if (status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) goto DONE; @@ -657,8 +697,8 @@ notmuch_database_get_timestamp (notmuch_database_t *notmuch, const char *key) } DONE: - if (db_key) - free (db_key); + if (db_path != path) + free ((char *) db_path); return ret; } @@ -852,12 +892,11 @@ _notmuch_database_link_message_to_children (notmuch_database_t *notmuch, * * We first look at 'message_file' and its link-relevant headers * (References and In-Reply-To) for message IDs. We also look in the - * database for existing message that reference 'message'.p + * database for existing message that reference 'message'. * - * The end result is to call _notmuch_message_add_thread_id with one - * or more thread IDs to which this message belongs, (including - * generating a new thread ID if necessary if the message doesn't - * connect to any existing threads). + * The end result is to call _notmuch_message_ensure_thread_id which + * generates a new thread ID if the message doesn't connect to any + * existing threads. */ static notmuch_status_t _notmuch_database_link_message (notmuch_database_t *notmuch, @@ -1026,3 +1065,46 @@ notmuch_database_add_message (notmuch_database_t *notmuch, return ret; } + +notmuch_tags_t * +_notmuch_convert_tags (void *ctx, Xapian::TermIterator &i, + Xapian::TermIterator &end) +{ + const char *prefix = _find_prefix ("tag"); + notmuch_tags_t *tags; + std::string tag; + + /* Currently this iteration is written with the assumption that + * "tag" has a single-character prefix. */ + assert (strlen (prefix) == 1); + + tags = _notmuch_tags_create (ctx); + if (unlikely (tags == NULL)) + return NULL; + + i.skip_to (prefix); + + while (i != end) { + tag = *i; + + if (tag.empty () || tag[0] != *prefix) + break; + + _notmuch_tags_add_tag (tags, tag.c_str () + 1); + + i++; + } + + _notmuch_tags_prepare_iterator (tags); + + return tags; +} + +notmuch_tags_t * +notmuch_database_get_all_tags (notmuch_database_t *db) +{ + Xapian::TermIterator i, end; + i = db->xapian_db->allterms_begin(); + end = db->xapian_db->allterms_end(); + return _notmuch_convert_tags(db, i, end); +}