From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QHWuLasVoGAeqwAAgWs5BA (envelope-from ) for ; Sat, 15 May 2021 20:40:43 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id lLYfKasVoGDtGQAAbx9fmQ (envelope-from ) for ; Sat, 15 May 2021 18:40:43 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4D51D2BD2A for ; Sat, 15 May 2021 20:40:43 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 4226027187; Sat, 15 May 2021 14:40:35 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id EC1B520017 for ; Sat, 15 May 2021 14:40:31 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id AC04360018; Sat, 15 May 2021 14:40:30 -0400 (EDT) Received: (nullmailer pid 2856867 invoked by uid 1000); Sat, 15 May 2021 18:40:29 -0000 From: David Bremner To: David Bremner , notmuch@notmuchmail.org Subject: [PATCH] lib/n_d_index_file: re-use thread-id of existing message Date: Sat, 15 May 2021 15:40:22 -0300 Message-Id: <20210515184022.2856800-1-david@tethera.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210515130507.2629859-1-david@tethera.net> References: <20210515130507.2629859-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 7AW65VV47MZR7SMMBGPK4QZ24ZTDK5C6 X-Message-ID-Hash: 7AW65VV47MZR7SMMBGPK4QZ24ZTDK5C6 X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1621104043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=SUaozLLPl8+13UGCdA23LBuK7McMMSxWkSfzJ2SNflA=; b=p56CncNOX4R5W/vEwkXHpsXT0j95i6eVq97RMgDT4yaLhxt/D9qlNb4/25Fnj2j0+APFF+ ip3TNE13Eh0EzepG1Q9qtvBcF3ekrk+PV5ub3YgSBNKTjqvBrUvTWR91YgB7xbrnBGYXcx fk2Kyg+vKGhRcGZodVWtIgXEfgk7nR3bExJSf1w9y3RcSWsGUmonio886agh4BdWng6goF wIaFoM8Y1THrJyHIPtSFFIPdA3sEf9VmIrge81By0lTpWyu7A9Tj78z6hETjGTo9npmAdh /Hv+h8yRiORwXFiIHHUfihjdLFBItTt5mOfobudGzNfBN5u6KBblYwyCfXWgpw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1621104043; a=rsa-sha256; cv=none; b=O/XoS9ueo31D9vQMCd33eD1Qj/tKPfO3XPAhT8srTy6LYJ0dm+Ooume4HVMqH8SQrl5Jyu xA4/KezpmzXfAtR+RA2YVnFuov5M0+qVwWi+PGZKeD70Icichc4jeCS6W1Z03mH+xuiOjk 7s2cq8l5wzzYxzkg3MqGAqbJW5edmU5Ma1RDg6DYPKNxOhYay/HC7F+iAXt6haHi4807nA MUE+SnCvbFklRMtqFQ42154/+3i3Hw2poGWhfEXZ7rA6i/q00cr5b3oTbn15PwUalB9rEh jko92Xv7X6H0MVFare29MIiEY09JIVnzGLpeDui6g55AFIrShUimgl98yx8FUw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.07 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 4D51D2BD2A X-Spam-Score: -1.07 X-Migadu-Scanner: scn0.migadu.com X-TUID: Bli++KrG8bX1 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. --- lib/add-message.cc | 9 ++++++--- test/T357-index-decryption.sh | 26 ++++++++++++-------------- test/T670-duplicate-mid.sh | 1 - 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/add-message.cc b/lib/add-message.cc index d4a00b17..b16748fd 100644 --- a/lib/add-message.cc +++ b/lib/add-message.cc @@ -404,14 +404,17 @@ static notmuch_status_t _notmuch_database_link_message (notmuch_database_t *notmuch, notmuch_message_t *message, notmuch_message_file_t *message_file, - bool is_ghost) + bool is_ghost, + bool is_new) { void *local = talloc_new (NULL); notmuch_status_t status; const char *thread_id = NULL; /* 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) thread_id = notmuch_message_get_thread_id (message); } else { @@ -538,7 +541,7 @@ notmuch_database_index_file (notmuch_database_t *notmuch, } ret = _notmuch_database_link_message (notmuch, message, - message_file, is_ghost); + message_file, is_ghost, is_new); if (ret) goto DONE; diff --git a/test/T357-index-decryption.sh b/test/T357-index-decryption.sh index b81bdfe1..3afefc2a 100755 --- a/test/T357-index-decryption.sh +++ b/test/T357-index-decryption.sh @@ -113,12 +113,10 @@ test_expect_equal \ "$expected" # 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" notmuch insert --folder=sent --decrypt=true <<<"$contents" -output=$(notmuch search wumpus) -expected='thread:0000000000000005 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (encrypted inbox unread)' +output=$(notmuch search wumpus | notmuch_search_sanitize) +expected='thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (encrypted inbox unread)' test_expect_equal \ "$output" \ "$expected" @@ -128,9 +126,9 @@ test_expect_equal \ test_begin_subtest 'tagging all messages' test_expect_success 'notmuch tag +blarney "encrypted message"' test_begin_subtest "verify that tags have not changed" -output=$(notmuch search tag:blarney) -expected='thread:0000000000000001 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)' +output=$(notmuch search tag:blarney | notmuch_search_sanitize) +expected='thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 001 (blarney encrypted inbox) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (blarney encrypted inbox unread)' test_expect_equal \ "$output" \ "$expected" @@ -139,14 +137,14 @@ test_expect_equal \ test_begin_subtest 'reindex old messages' test_expect_success 'notmuch reindex --decrypt=true tag:encrypted and not property:index.decryption=success' test_begin_subtest "reindexed encrypted message, including cleartext" -output=$(notmuch search wumpus) +output=$(notmuch search wumpus | notmuch_search_sanitize) test_expect_equal \ "$output" \ "$expected" # and the same search, but by property ($expected is untouched): 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 \ "$output" \ "$expected" @@ -155,7 +153,7 @@ test_expect_equal \ test_begin_subtest 'reindex in auto mode' test_expect_success 'notmuch reindex tag:encrypted and property:index.decryption=success' test_begin_subtest "reindexed encrypted messages, should not have changed" -output=$(notmuch search wumpus) +output=$(notmuch search wumpus | notmuch_search_sanitize) test_expect_equal \ "$output" \ "$expected" @@ -189,9 +187,9 @@ test_expect_equal \ # ensure that the tags remain even when we are dropping the cleartext. test_begin_subtest "verify that tags remain without cleartext" -output=$(notmuch search tag:blarney) -expected='thread:0000000000000001 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)' +output=$(notmuch search tag:blarney | notmuch_search_sanitize) +expected='thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 001 (blarney encrypted inbox) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (blarney encrypted inbox unread)' test_expect_equal \ "$output" \ "$expected" @@ -200,7 +198,7 @@ test_begin_subtest "index cleartext without keeping session keys" test_expect_success "notmuch reindex --decrypt=nostash tag:blarney" test_begin_subtest "Ensure that the indexed terms are present" -output=$(notmuch search wumpus) +output=$(notmuch search wumpus | notmuch_search_sanitize) test_expect_equal \ "$output" \ "$expected" diff --git a/test/T670-duplicate-mid.sh b/test/T670-duplicate-mid.sh index 3fd59ca5..5359e542 100755 --- a/test/T670-duplicate-mid.sh +++ b/test/T670-duplicate-mid.sh @@ -10,7 +10,6 @@ add_message '[id]="duplicate"' '[subject]="message 2" [filename]=copy2' add_message '[id]="duplicate"' '[subject]="message 0" [filename]=copy0' test_begin_subtest 'at most 1 thread-id per xapian document' -test_subtest_known_broken db=${MAIL_DIR}/.notmuch/xapian cp /dev/null OUTPUT.raw for doc in $(xapian-delve -1 -t '' "$db" | grep '^[1-9]'); do -- 2.30.2