user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 6/6] contentid: ignore duplicate References: headers
Date: Thu, 23 Jan 2020 23:05:59 +0000	[thread overview]
Message-ID: <20200123230559.16781-7-e@yhbt.net> (raw)
In-Reply-To: <20200123230559.16781-1-e@yhbt.net>

OverIdx::parse_references already skips duplicate
References (which we use in SearchThread for rendering).
So there's no reason for our content deduplication logic
to care if a Message-Id in the Reference header is mentioned
twice.
---
 lib/PublicInbox/ContentId.pm | 3 +--
 lib/PublicInbox/OverIdx.pm   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/ContentId.pm b/lib/PublicInbox/ContentId.pm
index 0c4a8678..65691593 100644
--- a/lib/PublicInbox/ContentId.pm
+++ b/lib/PublicInbox/ContentId.pm
@@ -64,8 +64,7 @@ sub content_digest ($) {
 	# if we got here, we've already got Message-ID reuse
 	my %seen = map { $_ => 1 } @{mids($hdr)};
 	foreach my $mid (@{references($hdr)}) {
-		next if $seen{$mid};
-		$dig->add("ref\0$mid\0");
+		$dig->add("ref\0$mid\0") unless $seen{$mid}++;
 	}
 
 	# Only use Sender: if From is not present
diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index 189bd21d..5f1007aa 100644
--- a/lib/PublicInbox/OverIdx.pm
+++ b/lib/PublicInbox/OverIdx.pm
@@ -230,8 +230,7 @@ sub parse_references ($$$) {
 			warn "References: <$ref> too long, ignoring\n";
 			next;
 		}
-		next if $seen{$ref}++;
-		push @keep, $ref;
+		push(@keep, $ref) unless $seen{$ref}++;
 	}
 	$smsg->{references} = '<'.join('> <', @keep).'>' if @keep;
 	\@keep;

      parent reply	other threads:[~2020-01-23 23:06 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-23 23:05 [PATCH 0/6] shorten and simplify uniq logic Eric Wong
2020-01-23 23:05 ` [PATCH 1/6] contentid: use map to generate %seen for Message-Ids Eric Wong
2020-01-23 23:05 ` [PATCH 2/6] nntp: simplify setting X-Alt-Message-ID Eric Wong
2020-01-23 23:05 ` [PATCH 3/6] inbox: simplify filtering for duplicate NNTP URLs Eric Wong
2020-01-23 23:05 ` [PATCH 4/6] mid: shorten uniq_mids logic Eric Wong
2020-01-23 23:05 ` [PATCH 5/6] wwwstream: shorten cloneurl uniquification Eric Wong
2020-01-23 23:05 ` Eric Wong [this message]

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: http://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200123230559.16781-7-e@yhbt.net \
    --to=e@yhbt.net \
    --cc=meta@public-inbox.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://80x24.org/public-inbox.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).