debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/n_d_index_file: re-use thread-id of existing message

Browse source 
This prevents the message document getting multiple thread-id terms
when there are multiple files with the same message-id.

This change shifts some thread ids, requiring adjustments to other tests.
This commit is contained in:
David Bremner 2021-05-15 15:40:22 -03:00
parent 349fc29803
commit 3f4de98e7c
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/add-message.cc
View file

@ -407,14 +407,17 @@ static notmuch_status_t
_notmuch_database_link_message (notmuch_database_t *notmuch, _notmuch_database_link_message (notmuch_database_t *notmuch,
notmuch_message_t *message, notmuch_message_t *message,
notmuch_message_file_t *message_file, notmuch_message_file_t *message_file,
bool is_ghost) bool is_ghost,
bool is_new)
{ {
void *local = talloc_new (NULL); void *local = talloc_new (NULL);
notmuch_status_t status; notmuch_status_t status;
const char *thread_id = NULL; const char *thread_id = NULL;
/* Check if the message already had a thread ID */ /* Check if the message already had a thread ID */
if (notmuch->features & NOTMUCH_FEATURE_GHOSTS) { if (! is_new) {
thread_id = notmuch_message_get_thread_id (message);
} else if (notmuch->features & NOTMUCH_FEATURE_GHOSTS) {
if (is_ghost) if (is_ghost)
thread_id = notmuch_message_get_thread_id (message); thread_id = notmuch_message_get_thread_id (message);
} else { } else {
@ -541,7 +544,7 @@ notmuch_database_index_file (notmuch_database_t *notmuch,
} }
ret = _notmuch_database_link_message (notmuch, message, ret = _notmuch_database_link_message (notmuch, message,
message_file, is_ghost); message_file, is_ghost, is_new);
if (ret) if (ret)
goto DONE; goto DONE;

26
test/T357-index-decryption.sh
View file

@ -112,12 +112,10 @@ test_expect_equal \
"$expected" "$expected"
# try inserting it with decryption, should appear as a single copy # try inserting it with decryption, should appear as a single copy
# (note: i think thread id skips 4 because of duplicate message-id
# insertion, above)
test_begin_subtest "message cleartext is present with insert --decrypt=true" test_begin_subtest "message cleartext is present with insert --decrypt=true"
notmuch insert --folder=sent --decrypt=true <<<"$contents" notmuch insert --folder=sent --decrypt=true <<<"$contents"
output=$(notmuch search wumpus) output=$(notmuch search wumpus | notmuch_search_sanitize)
expected='thread:0000000000000005 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (encrypted inbox unread)' expected='thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (encrypted inbox unread)'
test_expect_equal \ test_expect_equal \
"$output" \ "$output" \
"$expected" "$expected"
@ -127,9 +125,9 @@ test_expect_equal \
test_begin_subtest 'tagging all messages' test_begin_subtest 'tagging all messages'
test_expect_success 'notmuch tag +blarney "encrypted message"' test_expect_success 'notmuch tag +blarney "encrypted message"'
test_begin_subtest "verify that tags have not changed" test_begin_subtest "verify that tags have not changed"
output=$(notmuch search tag:blarney) output=$(notmuch search tag:blarney | notmuch_search_sanitize)
expected='thread:0000000000000001 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 001 (blarney encrypted inbox) expected='thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 001 (blarney encrypted inbox)
thread:0000000000000005 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (blarney encrypted inbox unread)' thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (blarney encrypted inbox unread)'
test_expect_equal \ test_expect_equal \
"$output" \ "$output" \
"$expected" "$expected"
@ -138,14 +136,14 @@ test_expect_equal \
test_begin_subtest 'reindex old messages' test_begin_subtest 'reindex old messages'
test_expect_success 'notmuch reindex --decrypt=true tag:encrypted and not property:index.decryption=success' test_expect_success 'notmuch reindex --decrypt=true tag:encrypted and not property:index.decryption=success'
test_begin_subtest "reindexed encrypted message, including cleartext" test_begin_subtest "reindexed encrypted message, including cleartext"
output=$(notmuch search wumpus) output=$(notmuch search wumpus | notmuch_search_sanitize)
test_expect_equal \ test_expect_equal \
"$output" \ "$output" \
"$expected" "$expected"
# and the same search, but by property ($expected is untouched): # and the same search, but by property ($expected is untouched):
test_begin_subtest "emacs search by property for both messages" test_begin_subtest "emacs search by property for both messages"
output=$(notmuch search property:index.decryption=success) output=$(notmuch search property:index.decryption=success | notmuch_search_sanitize)
test_expect_equal \ test_expect_equal \
"$output" \ "$output" \
"$expected" "$expected"
@ -154,7 +152,7 @@ test_expect_equal \
test_begin_subtest 'reindex in auto mode' test_begin_subtest 'reindex in auto mode'
test_expect_success 'notmuch reindex tag:encrypted and property:index.decryption=success' test_expect_success 'notmuch reindex tag:encrypted and property:index.decryption=success'
test_begin_subtest "reindexed encrypted messages, should not have changed" test_begin_subtest "reindexed encrypted messages, should not have changed"
output=$(notmuch search wumpus) output=$(notmuch search wumpus | notmuch_search_sanitize)
test_expect_equal \ test_expect_equal \
"$output" \ "$output" \
"$expected" "$expected"
@ -188,9 +186,9 @@ test_expect_equal \
# ensure that the tags remain even when we are dropping the cleartext. # ensure that the tags remain even when we are dropping the cleartext.
test_begin_subtest "verify that tags remain without cleartext" test_begin_subtest "verify that tags remain without cleartext"
output=$(notmuch search tag:blarney) output=$(notmuch search tag:blarney | notmuch_search_sanitize)
expected='thread:0000000000000001 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 001 (blarney encrypted inbox) expected='thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 001 (blarney encrypted inbox)
thread:0000000000000005 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (blarney encrypted inbox unread)' thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (blarney encrypted inbox unread)'
test_expect_equal \ test_expect_equal \
"$output" \ "$output" \
"$expected" "$expected"
@ -199,7 +197,7 @@ test_begin_subtest "index cleartext without keeping session keys"
test_expect_success "notmuch reindex --decrypt=nostash tag:blarney" test_expect_success "notmuch reindex --decrypt=nostash tag:blarney"
test_begin_subtest "Ensure that the indexed terms are present" test_begin_subtest "Ensure that the indexed terms are present"
output=$(notmuch search wumpus) output=$(notmuch search wumpus | notmuch_search_sanitize)
test_expect_equal \ test_expect_equal \
"$output" \ "$output" \
"$expected" "$expected"

1
test/T670-duplicate-mid.sh
View file

@ -10,7 +10,6 @@ add_message '[id]="duplicate"' '[subject]="message 2" [filename]=copy2'
add_message '[id]="duplicate"' '[subject]="message 0" [filename]=copy0' add_message '[id]="duplicate"' '[subject]="message 0" [filename]=copy0'
test_begin_subtest 'at most 1 thread-id per xapian document' test_begin_subtest 'at most 1 thread-id per xapian document'
test_subtest_known_broken
db=${MAIL_DIR}/.notmuch/xapian db=${MAIL_DIR}/.notmuch/xapian
for doc in $(xapian-delve -1 -t '' "$db" | grep '^[1-9]'); do for doc in $(xapian-delve -1 -t '' "$db" | grep '^[1-9]'); do
xapian-delve -1 -r "$doc" "$db" | grep -c '^G' xapian-delve -1 -r "$doc" "$db" | grep -c '^G'