replace Xapian skeleton with SQLite overview DB

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

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 309775146fd1b015383c462e6178650f60dad5b7..142b5c8949945139f771d28df8ff546d868b8c21 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -9,6 +9,7 @@ use PublicInbox::Git;
 use PublicInbox::MID qw(mid2path);
 use Devel::Peek qw(SvREFCNT);
 use PublicInbox::MIME;
+use POSIX qw(strftime);
 
 my $cleanup_timer;
 eval {
@@ -132,6 +133,7 @@ sub max_git_part {
 sub mm {
        my ($self) = @_;
        $self->{mm} ||= eval {
+               require PublicInbox::Msgmap;
                _cleanup_later($self);
                my $dir = $self->{mainrepo};
                if (($self->{version} || 1) >= 2) {
@@ -270,12 +272,10 @@ sub msg_by_path ($$;$) {
 sub msg_by_smsg ($$;$) {
        my ($self, $smsg, $ref) = @_;
 
-       return unless defined $smsg; # ghost
-
-       # backwards compat to fallback to msg_by_mid
-       # TODO: remove if we bump SCHEMA_VERSION in Search.pm:
-       defined(my $blob = $smsg->{blob}) or
-                       return msg_by_path($self, mid2path($smsg->mid), $ref);
+       # ghosts may have undef smsg (from SearchThread.node) or
+       # no {blob} field (from each_smsg_by_mid)
+       return unless defined $smsg;
+       defined(my $blob = $smsg->{blob}) or return;
 
        my $str = git($self)->cat_file($blob, $ref);
        $$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s if $str;
@@ -295,15 +295,31 @@ sub path_check {
        git($self)->check('HEAD:'.$path);
 }
 
+sub mid2num($$) {
+       my ($self, $mid) = @_;
+       my $mm = mm($self) or return;
+       $mm->num_for($mid);
+}
+
+sub smsg_by_mid ($$) {
+       my ($self, $mid) = @_;
+       my $srch = search($self) or return;
+       # favor the Message-ID we used for the NNTP article number:
+       my $num = mid2num($self, $mid);
+       defined $num ? $srch->lookup_article($num) : undef;
+}
+
 sub msg_by_mid ($$;$) {
        my ($self, $mid, $ref) = @_;
        my $srch = search($self) or
-                       return msg_by_path($self, mid2path($mid), $ref);
-       my $smsg;
-       $srch->retry_reopen(sub {
-               $smsg = $srch->lookup_skeleton($mid) and $smsg->load_expand;
-       });
+               return msg_by_path($self, mid2path($mid), $ref);
+       my $smsg = smsg_by_mid($self, $mid);
        $smsg ? msg_by_smsg($self, $smsg, $ref) : undef;
 }
 
+sub recent {
+       my ($self, $opts) = @_;
+       search($self)->query('', $opts);
+}
+
 1;