From 9ec68aa9c4694bdf1b948bb93299e0270ec071ae Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Sat, 24 Oct 2009 23:05:08 -0700 Subject: [PATCH] Shuffle the value numbers around in the database. First, it's nice that for now we don't have any users yet, so we can make incompatible changes to the database layout like this without causing trouble. ;-) There are a few reasons for this change. First, we now use value 0 uniformly as a timestamp for both mail and timestamp documents, (which lets us cleanup an ugly and fragile bare 0 in the add_value and get_value calls in the timestamp code). Second, I want to drop the thread value entirely, so putting it at the end of the list means we can drop it as compatible change in the future. (I almost want to drop the message-ID value too, but it's nice to be able to sort on it to get diff-able output from "notmuch dump".) But the thread value we never use as a value, (we would never sort on it, for example). And it's totally redundant with the thread terms we store already. So expect it to disappear soon. --- database.cc | 5 +++-- message.cc | 2 +- notmuch-private.h | 9 +++------ query.cc | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/database.cc b/database.cc index 928e91ba..aaad7105 100644 --- a/database.cc +++ b/database.cc @@ -588,7 +588,8 @@ notmuch_database_set_timestamp (notmuch_database_t *notmuch, try { status = find_timestamp_document (notmuch, db_key, &doc, &doc_id); - doc.add_value (0, Xapian::sortable_serialise (timestamp)); + doc.add_value (NOTMUCH_VALUE_TIMESTAMP, + Xapian::sortable_serialise (timestamp)); if (status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) { char *term = talloc_asprintf (NULL, "%s%s", @@ -630,7 +631,7 @@ notmuch_database_get_timestamp (notmuch_database_t *notmuch, const char *key) if (status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) goto DONE; - ret = Xapian::sortable_unserialise (doc.get_value (0)); + ret = Xapian::sortable_unserialise (doc.get_value (NOTMUCH_VALUE_TIMESTAMP)); } catch (Xapian::Error &error) { goto DONE; } diff --git a/message.cc b/message.cc index 78b6fed6..f2405ac6 100644 --- a/message.cc +++ b/message.cc @@ -268,7 +268,7 @@ _notmuch_message_set_date (notmuch_message_t *message, time_value = notmuch_parse_date (date, NULL); - message->doc.add_value (NOTMUCH_VALUE_DATE, + message->doc.add_value (NOTMUCH_VALUE_TIMESTAMP, Xapian::sortable_serialise (time_value)); } diff --git a/notmuch-private.h b/notmuch-private.h index 88b01bd3..53e99bdd 100644 --- a/notmuch-private.h +++ b/notmuch-private.h @@ -67,13 +67,10 @@ NOTMUCH_BEGIN_DECLS #endif #endif -/* These value numbers are chosen to be sup compatible (for now at - * least). */ - typedef enum { - NOTMUCH_VALUE_MESSAGE_ID = 0, - NOTMUCH_VALUE_THREAD = 1, - NOTMUCH_VALUE_DATE = 2 + NOTMUCH_VALUE_TIMESTAMP = 0, + NOTMUCH_VALUE_MESSAGE_ID, + NOTMUCH_VALUE_THREAD } notmuch_value_t; /* Xapian (with flint backend) complains if we provide a term longer diff --git a/query.cc b/query.cc index ae986d35..c68bd37a 100644 --- a/query.cc +++ b/query.cc @@ -114,10 +114,10 @@ notmuch_query_search (notmuch_query_t *query) switch (query->sort) { case NOTMUCH_SORT_DATE_OLDEST_FIRST: - enquire.set_sort_by_value (NOTMUCH_VALUE_DATE, FALSE); + enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, FALSE); break; case NOTMUCH_SORT_DATE_NEWEST_FIRST: - enquire.set_sort_by_value (NOTMUCH_VALUE_DATE, TRUE); + enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, TRUE); break; case NOTMUCH_SORT_MESSAGE_ID: enquire.set_sort_by_value (NOTMUCH_VALUE_MESSAGE_ID, FALSE);