From 8e81d6f0d44198717ae540421a09824d75c9bb6d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 20 Mar 2020 08:18:13 +0000 Subject: index: use git commit times on missing Date/Received When indexing messages without Date: and/or Received: headers, fall back to using timestamps originally recorded by git in the commit object. This allows git mirrors to preserve the import datestamp and timestamp of a message according to what was fed into git, instead of blindly falling back to the current time. --- lib/PublicInbox/SearchIdxShard.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'lib/PublicInbox/SearchIdxShard.pm') diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm index ee176e50..74c624a4 100644 --- a/lib/PublicInbox/SearchIdxShard.pm +++ b/lib/PublicInbox/SearchIdxShard.pm @@ -67,12 +67,15 @@ sub shard_worker_loop ($$$$$) { $self->remove_by_oid($oid, $mid); } else { chomp $line; - my ($len, $artnum, $oid, $mid0) = split(/ /, $line); + my ($len, $artnum, $oid, $mid0, $autime, $cotime) = + split(/ /, $line); $self->begin_txn_lazy; my $n = read($r, my $msg, $len) or die "read: $!\n"; $n == $len or die "short read: $n != $len\n"; my $mime = PublicInbox::MIME->new(\$msg); $artnum = int($artnum); + $self->{autime} = $autime; + $self->{cotime} = $cotime; $self->add_message($mime, $n, $artnum, $oid, $mid0); } } @@ -81,13 +84,17 @@ sub shard_worker_loop ($$$$$) { # called by V2Writable sub index_raw { - my ($self, $bytes, $msgref, $artnum, $oid, $mid0, $mime) = @_; + my ($self, $bytes, $msgref, $artnum, $oid, $mid0, $mime, $times) = @_; + my $at = $times->{autime} // time; + my $ct = $times->{cotime} // time; if (my $w = $self->{w}) { - print $w "$bytes $artnum $oid $mid0\n", $$msgref or die - "failed to write shard $!\n"; + print $w "$bytes $artnum $oid $mid0 $at $ct\n", $$msgref or + die "failed to write shard $!\n"; } else { $$msgref = undef; $self->begin_txn_lazy; + $self->{autime} = $at; + $self->{cotime} = $ct; $self->add_message($mime, $bytes, $artnum, $oid, $mid0); } } -- cgit v1.2.3-24-ge0c7