v2/ui: some hacky things to get the PSGI UI to show up

Fortunately, Xapian multiple database support makes things
easier but we still need to handle the skeleton DB separately.

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index e7856e3cd4d20af2aca0eea03142abba727b736b..f000a950e48b2754a54fb8477ace9de34c106712 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -73,6 +73,10 @@ sub new {
        _set_limiter($opts, $pi_config, 'httpbackend');
        _set_uint($opts, 'feedmax', 25);
        $opts->{nntpserver} ||= $pi_config->{'publicinbox.nntpserver'};
+       my $dir = $opts->{mainrepo};
+       if (defined $dir && -f "$dir/msgmap.sqlite3") { # XXX DIRTY
+               $opts->{version} = 2;
+       }
        bless $opts, $class;
 }
 
@@ -92,7 +96,12 @@ sub mm {
        my ($self) = @_;
        $self->{mm} ||= eval {
                _cleanup_later($self);
-               PublicInbox::Msgmap->new($self->{mainrepo});
+               my $dir = $self->{mainrepo};
+               if (($self->{version} || 1) >= 2) {
+                       PublicInbox::Msgmap->new_file("$dir/msgmap.sqlite3");
+               } else {
+                       PublicInbox::Msgmap->new($dir);
+               }
        };
 }
 
@@ -100,7 +109,7 @@ sub search {
        my ($self) = @_;
        $self->{search} ||= eval {
                _cleanup_later($self);
-               PublicInbox::Search->new($self->{mainrepo}, $self->{altid});
+               PublicInbox::Search->new($self, $self->{altid});
        };
 }
 
@@ -229,7 +238,7 @@ sub msg_by_smsg ($$;$) {
        # 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_mid($self, $smsg->mid);
+                       return msg_by_path($self, mid2path($smsg->mid), $ref);
 
        my $str = git($self)->cat_file($blob, $ref);
        $$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s if $str;
@@ -243,7 +252,11 @@ sub path_check {
 
 sub msg_by_mid ($$;$) {
        my ($self, $mid, $ref) = @_;
-       msg_by_path($self, mid2path($mid), $ref);
+       my $srch = search($self) or
+                       return msg_by_path($self, mid2path($mid), $ref);
+       my $smsg = $srch->lookup_skeleton($mid) or return;
+       $smsg->load_expand;
+       msg_by_smsg($self, $smsg, $ref);
 }
 
 1;

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 3b2805985d15df35cadd88498675aa7822e6d686..b20b2ccd3e39f3b0ede3425c1b46c55f03654674 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -144,7 +144,26 @@ sub new {
                altid => $altid,
                version => $version,
        }, $class;
-       $self->{xdb} = Search::Xapian::Database->new($self->xdir);
+       if ($version >= 2) {
+               my $dir = "$self->{mainrepo}/xap" . SCHEMA_VERSION;
+               my $xdb;
+               my $parts = 0;
+               foreach my $part (<$dir/*>) {
+                       -d $part && $part =~ m!/\d+\z! or next;
+                       $parts++;
+                       my $sub = Search::Xapian::Database->new($part);
+                       if ($xdb) {
+                               $xdb->add_database($sub);
+                       } else {
+                               $xdb = $sub;
+                       }
+               }
+               warn "v2 repo with $parts found in $dir\n";
+               $self->{xdb} = $xdb;
+               $self->{skel} = Search::Xapian::Database->new("$dir/all");
+       } else {
+               $self->{xdb} = Search::Xapian::Database->new($self->xdir);
+       }
        $self;
 }
 
@@ -166,7 +185,7 @@ sub query {
 
 sub get_thread {
        my ($self, $mid, $opts) = @_;
-       my $smsg = eval { $self->lookup_message($mid) };
+       my $smsg = eval { $self->lookup_skeleton($mid) };
 
        return { total => 0, msgs => [] } unless $smsg;
        my $qtid = Search::Xapian::Query->new('G' . $smsg->thread_id);
@@ -298,6 +317,25 @@ sub query_xover {
        _do_enquire($self, $query, {num => 1, limit => 200, offset => $offset});
 }
 
+sub lookup_skeleton {
+       my ($self, $mid) = @_;
+       my $skel = $self->{skel} or return lookup_message($self, $mid);
+       $mid = mid_clean($mid);
+       my $term = 'XMID' . $mid;
+       my $smsg;
+       my $beg = $skel->postlist_begin($term);
+       if ($beg != $skel->postlist_end($term)) {
+               my $doc_id = $beg->get_docid;
+               if (defined $doc_id) {
+                       # raises on error:
+                       my $doc = $skel->get_document($doc_id);
+                       $smsg = PublicInbox::SearchMsg->wrap($doc, $mid);
+                       $smsg->{doc_id} = $doc_id;
+               }
+       }
+       $smsg;
+}
+
 sub lookup_message {
        my ($self, $mid) = @_;
        $mid = mid_clean($mid);