diff options
author | Eric Wong (Contractor, The Linux Foundation) <e@80x24.org> | 2018-02-22 07:15:54 +0000 |
---|---|---|
committer | Eric Wong (Contractor, The Linux Foundation) <e@80x24.org> | 2018-02-28 18:42:44 +0000 |
commit | 126d94b10886b02a3936f1429cab1eaea21b6025 (patch) | |
tree | dcaa2e2aa48fc1a42f832e335abd6a268357cae6 /lib/PublicInbox/Search.pm | |
parent | 61ecf6a904b868ce791115231b11859d725c6113 (diff) | |
download | public-inbox-126d94b10886b02a3936f1429cab1eaea21b6025.tar.gz |
Fortunately, Xapian multiple database support makes things easier but we still need to handle the skeleton DB separately.
Diffstat (limited to 'lib/PublicInbox/Search.pm')
-rw-r--r-- | lib/PublicInbox/Search.pm | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index 3b280598..b20b2ccd 100644 --- 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); |