From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 429311F5AE for ; Mon, 31 May 2021 10:20:06 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] lei import: reduce writes to lei/store on IMAP sync Date: Mon, 31 May 2021 10:20:06 +0000 Message-Id: <20210531102006.3660-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We don't need to write VMD changes to lei/store if local keywords are unchanged. --- lib/PublicInbox/LeiImport.pm | 1 + lib/PublicInbox/LeiSearch.pm | 8 +++++--- lib/PublicInbox/NetReader.pm | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index f9a46ec5..860a2c98 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -50,6 +50,7 @@ sub input_net_cb { # imap_each / nntp_each } elsif ($vmd) { # old message, kw only my $oid = $self->{-lms_ro}->imap_oid2($uri, $uid) // return; my @docids = $self->{lse}->over->blob_exists($oid) or return; + $self->{lse}->kw_changed(undef, $kw, \@docids) or return; my $lei = $self->{lei}; $lei->qerr("# $oid => @$kw\n") if $lei->{opt}->{verbose}; $self->{lei}->{sto}->ipc_do('set_eml_vmd', undef, diff --git a/lib/PublicInbox/LeiSearch.pm b/lib/PublicInbox/LeiSearch.pm index b09d1e45..d0963e92 100644 --- a/lib/PublicInbox/LeiSearch.pm +++ b/lib/PublicInbox/LeiSearch.pm @@ -133,9 +133,11 @@ sub xoids_for { # returns true if $eml is indexed by lei/store and keywords don't match sub kw_changed { my ($self, $eml, $new_kw_sorted, $docids) = @_; - my $xoids = xoids_for($self, $eml) // return; - $docids //= []; - @$docids = sort { $a <=> $b } values %$xoids; + if ($eml) { + my $xoids = xoids_for($self, $eml) // return; + $docids //= []; + @$docids = sort { $a <=> $b } values %$xoids; + } my $cur_kw = msg_keywords($self, $docids->[0]); # RFC 5550 sec 5.9 on the $Forwarded keyword states: diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm index b97444fd..39a8f7fc 100644 --- a/lib/PublicInbox/NetReader.pm +++ b/lib/PublicInbox/NetReader.pm @@ -409,7 +409,7 @@ sub flags2kw ($$$$) { warn "# unknown IMAP flag $f <$uri/;UID=$uid>\n"; } } - @$kw = sort @$kw; # for all UI/UX purposes + @$kw = sort @$kw; # for LeiSearch->kw_changed and UI/UX purposes $kw; }