search: use different Enquire object for skeleton queries

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

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index b20b2ccd3e39f3b0ede3425c1b46c55f03654674..0f102dac0b72414d87c52233030e81f3ddfd5bd5 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -167,7 +167,13 @@ sub new {
        $self;
 }
 
-sub reopen { $_[0]->{xdb}->reopen }
+sub reopen {
+       my ($self) = @_;
+       $self->{xdb}->reopen;
+       if (my $skel = $self->{skel}) {
+               $skel->reopen;
+       }
+}
 
 # read-only
 sub query {
@@ -185,7 +191,7 @@ sub query {
 
 sub get_thread {
        my ($self, $mid, $opts) = @_;
-       my $smsg = eval { $self->lookup_skeleton($mid) };
+       my $smsg = retry_reopen($self, sub { lookup_skeleton($self, $mid) });
 
        return { total => 0, msgs => [] } unless $smsg;
        my $qtid = Search::Xapian::Query->new('G' . $smsg->thread_id);
@@ -201,7 +207,7 @@ sub get_thread {
        # always sort threads by timestamp, this makes life easier
        # for the threading algorithm (in SearchThread.pm)
        $opts->{asc} = 1;
-
+       $opts->{enquire} = enquire_skel($self);
        _do_enquire($self, $qtid, $opts);
 }
 
@@ -216,6 +222,7 @@ sub retry_reopen {
                if (ref($@) eq 'Search::Xapian::DatabaseModifiedError') {
                        reopen($self);
                } else {
+                       warn "ref: ", ref($@), "\n";
                        die;
                }
        }
@@ -228,7 +235,7 @@ sub _do_enquire {
 
 sub _enquire_once {
        my ($self, $query, $opts) = @_;
-       my $enquire = $self->enquire;
+       my $enquire = $opts->{enquire} || enquire($self);
        if (defined $query) {
                $query = Search::Xapian::Query->new(OP_AND,$query,$mail_query);
        } else {
@@ -416,6 +423,15 @@ sub enquire {
        $self->{enquire} ||= Search::Xapian::Enquire->new($self->{xdb});
 }
 
+sub enquire_skel {
+       my ($self) = @_;
+       if (my $skel = $self->{skel}) {
+               $self->{enquire_skel} ||= Search::Xapian::Enquire->new($skel);
+       } else {
+               enquire($self);
+       }
+}
+
 sub help {
        my ($self) = @_;
        $self->qp; # parse altids