imap: STATUS/EXAMINE: rely on SQLite overview

[public-inbox.git] / lib / PublicInbox / IMAP.pm

diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm
index fe3c7d1a85bba20174642fb9399dce902bcdf0f8..41c8066446c640e6db3fd0d9f988958032f73d5e 100644 (file)
--- a/lib/PublicInbox/IMAP.pm
+++ b/lib/PublicInbox/IMAP.pm
@@ -183,7 +183,7 @@ sub cmd_noop ($$) { "$_[1] OK Noop done\r\n" }
 # called by PublicInbox::InboxIdle
 sub on_inbox_unlock {
        my ($self, $ibx) = @_;
-       my $new = $ibx->mm->max;
+       my $new = $ibx->over->max;
        my $uid_base = $self->{uid_base} // 0;
        my $uid_end = $uid_base + UID_BLOCK;
        defined(my $old = $self->{-idle_max}) or die 'BUG: -idle_max unset';
@@ -223,7 +223,7 @@ sub cmd_idle ($$) {
        # IDLE seems allowed by dovecot w/o a mailbox selected *shrug*
        my $ibx = $self->{ibx} or return "$tag BAD no mailbox selected\r\n";
        $self->{-idle_tag} = $tag;
-       my $max = $ibx->mm->max // 0;
+       my $max = $ibx->over->max;
        my $uid_end = $self->{uid_base} + UID_BLOCK;
        my $sock = $self->{sock} or return;
        my $fd = fileno($sock);
@@ -283,14 +283,20 @@ sub inbox_lookup ($$) {
                my $mb_top = $1;
                $uid_base = $2 * UID_BLOCK;
                $ibx = $self->{imapd}->{mailboxes}->{lc $mailbox} or return;
-               $exists = $ibx->mm->max // 0;
-               ensure_ranges_exist($self->{imapd}, $ibx, $exists);
-               my $uid_end = $uid_base + UID_BLOCK;
-               $exists = $uid_end if $exists > $uid_end;
-               $uidnext = $exists + 1;
-               $exists -= $uid_base;
+               my $max;
+               ($exists, $uidnext, $max) = $ibx->over->imap_status($uid_base,
+                                                       $uid_base + UID_BLOCK);
+               ensure_ranges_exist($self->{imapd}, $ibx, $max);
        } else { # check for dummy inboxes
-               $ibx = $self->{imapd}->{mailboxes}->{lc $mailbox} or return;
+               $mailbox = lc $mailbox;
+               $ibx = $self->{imapd}->{mailboxes}->{$mailbox} or return;
+
+               # if "INBOX.foo.bar" is selected and "INBOX.foo.bar.0",
+               # check for new UID ranges (e.g. "INBOX.foo.bar.1")
+               if (my $z = $self->{imapd}->{mailboxes}->{"$mailbox.0"}) {
+                       ensure_ranges_exist($self->{imapd}, $z, $z->over->max);
+               }
+
                $uid_base = $exists = 0;
                $uidnext = 1;
        }
@@ -475,12 +481,12 @@ sub requeue_once ($) {
        $self->requeue if $new_size == 1;
 }
 
-# my ($uid_base, $UID) = @_;
-sub fetch_msn_uid ($$) { '* '.($_[1] - $_[0]).' FETCH (UID '.$_[1] }
+# my ($msn, $UID) = @_;
+sub fetch_msn_uid ($$) { '* '.(${$_[0]}++).' FETCH (UID '.$_[1] }
 
 sub fetch_run_ops {
-       my ($self, $uid_base, $smsg, $bref, $ops, $partial) = @_;
-       $self->msg_more(fetch_msn_uid($uid_base, $smsg->{num}));
+       my ($self, $msn, $smsg, $bref, $ops, $partial) = @_;
+       $self->msg_more(fetch_msn_uid($msn, $smsg->{num}));
        my ($eml, $k);
        for (my $i = 0; $i < @$ops;) {
                $k = $ops->[$i++];
@@ -492,7 +498,7 @@ sub fetch_run_ops {
 
 sub fetch_blob_cb { # called by git->cat_async via git_async_cat
        my ($bref, $oid, $type, $size, $fetch_arg) = @_;
-       my ($self, undef, $msgs, undef, $ops, $partial) = @$fetch_arg;
+       my ($self, undef, $msgs, $range_info, $ops, $partial) = @$fetch_arg;
        my $smsg = shift @$msgs or die 'BUG: no smsg';
        if (!defined($oid)) {
                # it's possible to have TOCTOU if an admin runs
@@ -501,7 +507,7 @@ sub fetch_blob_cb { # called by git->cat_async via git_async_cat
        } else {
                $smsg->{blob} eq $oid or die "BUG: $smsg->{blob} != $oid";
        }
-       fetch_run_ops($self, $self->{uid_base}, $smsg, $bref, $ops, $partial);
+       fetch_run_ops($self, $range_info->[3], $smsg, $bref, $ops, $partial);
        requeue_once($self);
 }
 
@@ -590,7 +596,7 @@ sub range_step ($$) {
                ($beg, $end) = ($1 + 0, $2 + 0);
        } elsif ($range =~ /\A([0-9]+):\*\z/) {
                $beg = $1 + 0;
-               $end = $self->{ibx}->mm->max // 0;
+               $end = $self->{ibx}->over->max;
                my $uid_end = $self->{uid_base} + UID_BLOCK;
                $end = $uid_end if $end > $uid_end;
                $beg = $end if $beg > $end;
@@ -601,7 +607,8 @@ sub range_step ($$) {
                return 'BAD fetch range';
        }
        uid_clamp($self, \$beg, \$end) if defined($range);
-       [ $beg, $end, $$range_csv ];
+       my $msn = $beg - $self->{uid_base};
+       [ $beg, $end, $$range_csv, \$msn ];
 }
 
 sub refill_range ($$$) {
@@ -638,8 +645,7 @@ sub fetch_smsg { # long_response
                        return;
                }
        }
-       my $uid_base = $self->{uid_base};
-       fetch_run_ops($self, $uid_base, $_, undef, $ops) for @$msgs;
+       fetch_run_ops($self, $range_info->[3], $_, undef, $ops) for @$msgs;
        @$msgs = ();
        1; # more
 }
@@ -665,10 +671,10 @@ sub fetch_uid { # long_response
                }
                # continue looping
        }
-       my $uid_base = $self->{uid_base};
        my ($i, $k);
+       my $msn = $range_info->[3];
        for (@$uids) {
-               $self->msg_more(fetch_msn_uid($uid_base, $_));
+               $self->msg_more(fetch_msn_uid($msn, $_));
                for ($i = 0; $i < @$ops;) {
                        $k = $ops->[$i++];
                        $ops->[$i++]->($self, $k);
@@ -1093,14 +1099,14 @@ sub cmd_uid_search ($$$;) {
        if (!scalar(keys %$q)) {
                $self->msg_more('* SEARCH');
                my $beg = 1;
-               my $end = $ibx->mm->max // 0;
+               my $end = $ibx->over->max;
                uid_clamp($self, \$beg, \$end);
                long_response($self, \&uid_search_uid_range,
                                $tag, \$beg, $end, $sql);
        } elsif (my $uid = $q->{uid}) {
                if ($uid =~ /\A([0-9]+):([0-9]+|\*)\z/s) {
                        my ($beg, $end) = ($1, $2);
-                       $end = $ibx->mm->max if $end eq '*';
+                       $end = $ibx->over->max if $end eq '*';
                        uid_clamp($self, \$beg, \$end);
                        $self->msg_more('* SEARCH');
                        long_response($self, \&uid_search_uid_range,