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-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 2A2EB1F4B4 for ; Fri, 16 Oct 2020 07:00:34 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 01/64] inbox: add uidvalidity method Date: Fri, 16 Oct 2020 06:59:31 +0000 Message-Id: <20201016070034.22204-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This will make it easier to deal with ExtSearchIdx, which won't have msgmap. --- lib/PublicInbox/DummyInbox.pm | 4 ++-- lib/PublicInbox/IMAPD.pm | 6 +++--- lib/PublicInbox/Inbox.pm | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/PublicInbox/DummyInbox.pm b/lib/PublicInbox/DummyInbox.pm index 69b0b683..02426f13 100644 --- a/lib/PublicInbox/DummyInbox.pm +++ b/lib/PublicInbox/DummyInbox.pm @@ -7,13 +7,13 @@ package PublicInbox::DummyInbox; use strict; -sub created_at { 0 } # Msgmap::created_at +sub uidvalidity { 0 } # Msgmap::created_at sub mm { shift } sub uid_range { [] } # Over::uid_range sub subscribe_unlock { undef }; no warnings 'once'; -*max = \&created_at; +*max = \&uidvalidity; *query_xover = \&uid_range; *over = \&mm; *search = *unsubscribe_unlock = diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm index 3c211ee1..bb705136 100644 --- a/lib/PublicInbox/IMAPD.pm +++ b/lib/PublicInbox/IMAPD.pm @@ -38,13 +38,13 @@ sub imapd_refresh_ibx { # pi_config->each_inbox cb } $ibx->over or return; $ibx->{over} = undef; - my $mm = $ibx->mm or return; - $ibx->{mm} = undef; # RFC 3501 2.3.1.1 - "A good UIDVALIDITY value to use in # this case is a 32-bit representation of the creation # date/time of the mailbox" - defined($ibx->{uidvalidity} = $mm->created_at) or return; + eval { $ibx->uidvalidity }; + my $mm = delete($ibx->{mm}) or return; + defined($ibx->{uidvalidity}) or return; PublicInbox::IMAP::ensure_slices_exist($imapd, $ibx, $mm->max // 0); # preload to avoid fragmentation: diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm index b0894a7d..cbb95b8d 100644 --- a/lib/PublicInbox/Inbox.pm +++ b/lib/PublicInbox/Inbox.pm @@ -428,4 +428,6 @@ sub on_unlock { } } +sub uidvalidity { $_[0]->{uidvalidity} //= $_[0]->mm->created_at } + 1;