X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiXSearch.pm;h=eb015978708024cfa1884ba9a98cf67727a6e20f;hb=232f8e376fe2856c8d34092e33a2c0750734c285;hp=ee93e074b1cacca62055cff1d507399ea5c224c5;hpb=f49d6a9ac8ff542c625e909798ef0947df45f34e;p=public-inbox.git diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index ee93e074..eb015978 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -8,6 +8,16 @@ package PublicInbox::LeiXSearch; use strict; use v5.10.1; use parent qw(PublicInbox::LeiSearch PublicInbox::IPC); +use PublicInbox::DS qw(now); +use PublicInbox::PktOp qw(pkt_do); +use File::Temp 0.19 (); # 0.19 for ->newdir +use File::Spec (); +use PublicInbox::Search qw(xap_terms); +use PublicInbox::Spawn qw(popen_rd spawn which); +use PublicInbox::MID qw(mids); +use PublicInbox::Smsg; +use PublicInbox::Eml; +use Fcntl qw(SEEK_SET F_SETFL O_APPEND O_RDWR); sub new { my ($class) = @_; @@ -20,15 +30,11 @@ sub new { sub attach_external { my ($self, $ibxish) = @_; # ibxish = ExtSearch or Inbox - - if (!$ibxish->can('over') || !$ibxish->over) { - return push(@{$self->{remotes}}, $ibxish) - } my $desc = $ibxish->{inboxdir} // $ibxish->{topdir}; my $srch = $ibxish->search or return warn("$desc not indexed for Xapian\n"); my @shards = $srch->xdb_shards_flat or - return warn("$desc has no Xapian shardsXapian\n"); + return warn("$desc has no Xapian shards\n"); if (delete $self->{xdb}) { # XXX: do we need this? # clobber existing {xdb} if amending @@ -53,14 +59,20 @@ sub attach_external { } # returns a list of local inboxes (or count in scalar context) -sub locals { - my %uniq = map {; "$_" => $_ } @{$_[0]->{shard2ibx} // []}; - values %uniq; -} +sub locals { @{$_[0]->{locals} // []} } + +sub remotes { @{$_[0]->{remotes} // []} } # called by PublicInbox::Search::xdb sub xdb_shards_flat { @{$_[0]->{shards_flat} // []} } +sub mitem_kw ($$;$) { + my ($smsg, $mitem, $flagged) = @_; + my $kw = xap_terms('K', $mitem->get_document); + $kw->{flagged} = 1 if $flagged; + $smsg->{kw} = [ sort keys %$kw ]; +} + # like over->get_art sub smsg_for { my ($self, $mitem) = @_; @@ -69,7 +81,9 @@ sub smsg_for { my $docid = $mitem->get_docid; my $shard = ($docid - 1) % $nshard; my $num = int(($docid - 1) / $nshard) + 1; - my $smsg = $self->{shard2ibx}->[$shard]->over->get_art($num); + my $ibx = $self->{shard2ibx}->[$shard]; + my $smsg = $ibx->over->get_art($num); + mitem_kw($smsg, $mitem) if $ibx->can('msg_keywords'); $smsg->{docid} = $docid; $smsg; } @@ -86,27 +100,59 @@ sub over {} sub _mset_more ($$) { my ($mset, $mo) = @_; my $size = $mset->size; - $size && (($mo->{offset} += $size) < ($mo->{limit} // 10000)); + $size >= $mo->{limit} && (($mo->{offset} += $size) < $mo->{limit}); } -sub query_thread_mset { # for --thread - my ($self, $lei, $ibxish) = @_; - my %sig = $lei->atfork_child_wq($self); - local @SIG{keys %sig} = values %sig; +# $startq will EOF when do_augment is done augmenting and allow +# query_mset and query_thread_mset to proceed. +sub wait_startq ($) { + my ($lei) = @_; + my $startq = delete $lei->{startq} or return; + while (1) { + my $n = sysread($startq, my $do_augment_done, 1); + if (defined $n) { + return if $n == 0; # no MUA + if ($do_augment_done eq 'q') { + $lei->{opt}->{quiet} = 1; + delete $lei->{opt}->{verbose}; + delete $lei->{-progress}; + } else { + $lei->fail("$$ WTF `$do_augment_done'"); + } + return; + } + return $lei->fail("$$ wait_startq: $!") unless $!{EINTR}; + } +} - my ($srch, $over) = ($ibxish->search, $ibxish->over); - unless ($srch && $over) { - my $desc = $ibxish->{inboxdir} // $ibxish->{topdir}; - warn "$desc not indexed by Xapian\n"; - return; +sub mset_progress { + my $lei = shift; + return if $lei->{early_mua} || !$lei->{-progress}; + if ($lei->{pkt_op_p}) { + pkt_do($lei->{pkt_op_p}, 'mset_progress', @_); + } else { # single lei-daemon consumer + my ($desc, $mset_size, $mset_total_est) = @_; + $lei->{-mset_total} += $mset_size; + $lei->qerr("# $desc $mset_size/$mset_total_est"); } +} + +sub query_thread_mset { # for --threads + my ($self, $ibxish) = @_; + local $0 = "$0 query_thread_mset"; + my $lei = $self->{lei}; + my ($srch, $over) = ($ibxish->search, $ibxish->over); + my $desc = $ibxish->{inboxdir} // $ibxish->{topdir}; + return warn("$desc not indexed by Xapian\n") unless ($srch && $over); my $mo = { %{$lei->{mset_opt}} }; my $mset; - my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei); - my $dd = $lei->{dd}; - $dd->prepare_dedupe; + my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei, $ibxish); + my $can_kw = !!$ibxish->can('msg_keywords'); + my $fl = $lei->{opt}->{threads} > 1; do { $mset = $srch->mset($mo->{qstr}, $mo); + mset_progress($lei, $desc, $mset->size, + $mset->get_matches_estimated); my $ids = $srch->mset_to_artnums($mset, $mo); my $ctx = { ids => $ids }; my $i = 0; @@ -114,87 +160,343 @@ sub query_thread_mset { # for --thread while ($over->expand_thread($ctx)) { for my $n (@{$ctx->{xids}}) { my $smsg = $over->get_art($n) or next; - next if $dd->is_smsg_dup($smsg); + wait_startq($lei); my $mitem = delete $n2item{$smsg->{num}}; + if ($mitem) { + if ($can_kw) { + mitem_kw($smsg, $mitem, $fl); + } else { + $smsg->{kw} = [ 'flagged' ]; + } + } $each_smsg->($smsg, $mitem); - # $self->out($buf .= $ORS); - # $emit_cb->($smsg); } @{$ctx->{xids}} = (); } } while (_mset_more($mset, $mo)); + undef $each_smsg; # drops @io for l2m->{each_smsg_done} $lei->{ovv}->ovv_atexit_child($lei); } -sub query_mset { # non-parallel for non-"--thread" users - my ($self, $lei, $srcs) = @_; - my %sig = $lei->atfork_child_wq($self); - local @SIG{keys %sig} = values %sig; +sub query_mset { # non-parallel for non-"--threads" users + my ($self) = @_; + local $0 = "$0 query_mset"; + my $lei = $self->{lei}; my $mo = { %{$lei->{mset_opt}} }; my $mset; - $self->attach_external($_) for @$srcs; - my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei); - my $dd = $lei->{dd}; - $dd->prepare_dedupe; + for my $loc (locals($self)) { + attach_external($self, $loc); + } + my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei, $self); do { $mset = $self->mset($mo->{qstr}, $mo); - for my $it ($mset->items) { - my $smsg = smsg_for($self, $it) or next; - next if $dd->is_smsg_dup($smsg); - $each_smsg->($smsg, $it); - # $self->out($buf .= $ORS) if defined $buf; - #$emit_cb->($smsg); + mset_progress($lei, 'xsearch', $mset->size, + $mset->size, $mset->get_matches_estimated); + for my $mitem ($mset->items) { + my $smsg = smsg_for($self, $mitem) or next; + wait_startq($lei); + $each_smsg->($smsg, $mitem); } } while (_mset_more($mset, $mo)); + undef $each_smsg; # drops @io for l2m->{each_smsg_done} $lei->{ovv}->ovv_atexit_child($lei); } -sub query_done { # PublicInbox::EOFpipe callback +sub each_remote_eml { # callback for MboxReader->mboxrd + my ($eml, $self, $lei, $each_smsg) = @_; + $lei->{sto}->ipc_do('set_eml', $eml) if $lei->{sto}; # --import-remote + my $smsg = bless {}, 'PublicInbox::Smsg'; + $smsg->populate($eml); + $smsg->parse_references($eml, mids($eml)); + $smsg->{$_} //= '' for qw(from to cc ds subject references mid); + delete @$smsg{qw(From Subject -ds -ts)}; + wait_startq($lei); + if ($lei->{-progress}) { + ++$lei->{-nr_remote_eml}; + my $now = now(); + my $next = $lei->{-next_progress} //= ($now + 1); + if ($now > $next) { + $lei->{-next_progress} = $now + 1; + my $nr = $lei->{-nr_remote_eml}; + $lei->err("# $lei->{-current_url} $nr/?"); + } + } + $each_smsg->($smsg, undef, $eml); +} + +sub query_remote_mboxrd { + my ($self, $uris) = @_; + local $0 = "$0 query_remote_mboxrd"; + local $SIG{TERM} = sub { exit(0) }; # for DESTROY (File::Temp, $reap) + my $lei = $self->{lei}; + my $opt = $lei->{opt}; + my @qform = (q => $lei->{mset_opt}->{qstr}, x => 'm'); + push(@qform, t => 1) if $opt->{threads}; + my $verbose = $opt->{verbose}; + my ($reap_tail, $reap_curl); + my $cerr = File::Temp->new(TEMPLATE => 'curl.err-XXXX', TMPDIR => 1); + fcntl($cerr, F_SETFL, O_APPEND|O_RDWR) or warn "set O_APPEND: $!"; + my $rdr = { 2 => $cerr, pgid => 0 }; + my $sigint_reap = $lei->can('sigint_reap'); + if ($verbose) { + # spawn a process to force line-buffering, otherwise curl + # will write 1 character at-a-time and parallel outputs + # mmmaaayyy llloookkk llliiikkkeee ttthhhiiisss + my $o = { 1 => $lei->{2}, 2 => $lei->{2}, pgid => 0 }; + my $pid = spawn(['tail', '-f', $cerr->filename], undef, $o); + $reap_tail = PublicInbox::OnDestroy->new($sigint_reap, $pid); + } + my $curl = PublicInbox::LeiCurl->new($lei, $self->{curl}) or return; + push @$curl, '-s', '-d', ''; + my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei); + for my $uri (@$uris) { + $lei->{-current_url} = $uri->as_string; + $lei->{-nr_remote_eml} = 0; + $uri->query_form(@qform); + my $cmd = $curl->for_uri($lei, $uri); + $lei->qerr("# $cmd"); + my ($fh, $pid) = popen_rd($cmd, undef, $rdr); + $reap_curl = PublicInbox::OnDestroy->new($sigint_reap, $pid); + $fh = IO::Uncompress::Gunzip->new($fh); + PublicInbox::MboxReader->mboxrd($fh, \&each_remote_eml, $self, + $lei, $each_smsg); + my $err = waitpid($pid, 0) == $pid ? undef + : "BUG: waitpid($cmd): $!"; + @$reap_curl = (); # cancel OnDestroy + die $err if $err; + my $nr = $lei->{-nr_remote_eml}; + if ($nr && $lei->{sto}) { + my $wait = $lei->{sto}->ipc_do('done'); + } + if ($? == 0) { + mset_progress($lei, $lei->{-current_url}, $nr, $nr); + next; + } + $err = ''; + if (-s $cerr) { + seek($cerr, 0, SEEK_SET) or + $lei->err("seek($cmd stderr): $!"); + $err = do { local $/; <$cerr> } // + "read($cmd stderr): $!"; + truncate($cerr, 0) or + $lei->err("truncate($cmd stderr): $!"); + } + next if (($? >> 8) == 22 && $err =~ /\b404\b/); + $uri->query_form(q => $lei->{mset_opt}->{qstr}); + $lei->child_error($?, "E: <$uri> $err"); + } + undef $each_smsg; + $lei->{ovv}->ovv_atexit_child($lei); +} + +# called by LeiOverview::each_smsg_cb +sub git { $_[0]->{git_tmp} // die 'BUG: caller did not set {git_tmp}' } + +sub git_tmp ($) { + my ($self) = @_; + my (%seen, @dirs); + my $tmp = File::Temp->newdir("lei_xsearch_git.$$-XXXX", TMPDIR => 1); + for my $ibxish (locals($self)) { + my $d = File::Spec->canonpath($ibxish->git->{git_dir}); + $seen{$d} //= push @dirs, "$d/objects\n" + } + my $git_dir = $tmp->dirname; + PublicInbox::Import::init_bare($git_dir); + my $f = "$git_dir/objects/info/alternates"; + open my $alt, '>', $f or die "open($f): $!"; + print $alt @dirs or die "print $f: $!"; + close $alt or die "close $f: $!"; + my $git = PublicInbox::Git->new($git_dir); + $git->{-tmp} = $tmp; + $git; +} + +sub xsearch_done_wait { # dwaitpid callback + my ($arg, $pid) = @_; + my ($wq, $lei) = @$arg; + $lei->child_error($?, 'non-fatal error from '.ref($wq)) if $?; +} + +sub query_done { # EOF callback for main daemon my ($lei) = @_; + my $l2m = delete $lei->{l2m}; + $l2m->wq_wait_old(\&xsearch_done_wait, $lei) if $l2m; + if (my $lxs = delete $lei->{lxs}) { + $lxs->wq_wait_old(\&xsearch_done_wait, $lei); + } $lei->{ovv}->ovv_end($lei); + if ($l2m) { # close() calls LeiToMail reap_compress + if (my $out = delete $lei->{old_1}) { + if (my $mbout = $lei->{1}) { + close($mbout) or return $lei->fail(<<""); +Error closing $lei->{ovv}->{dst}: $! + + } + $lei->{1} = $out; + } + if ($l2m->lock_free) { + $l2m->poke_dst; + $lei->poke_mua; + } else { # mbox users + $lei->start_mua; + } + } + $lei->{-progress} and + $lei->err('# ', $lei->{-mset_total} // 0, " matches"); $lei->dclose; } +sub do_post_augment { + my ($lei) = @_; + my $l2m = $lei->{l2m} or die 'BUG: unexpected do_post_augment'; + my $err; + eval { $l2m->post_augment($lei) }; + $err = $@; + if ($err) { + if (my $lxs = delete $lei->{lxs}) { + $lxs->wq_kill; + $lxs->wq_close(0, undef, $lei); + } + $lei->fail("$err"); + } + if (!$err && delete $lei->{early_mua}) { # non-augment case + $lei->start_mua; + } + close(delete $lei->{au_done}); # triggers wait_startq in lei_xsearch +} + +sub incr_post_augment { # called whenever an l2m shard finishes augment + my ($lei) = @_; + my $l2m = $lei->{l2m} or die 'BUG: unexpected incr_post_augment'; + return if ++$lei->{nr_post_augment} != $l2m->{-wq_nr_workers}; + do_post_augment($lei); +} + +my $MAX_PER_HOST = 4; + +sub concurrency { + my ($self, $opt) = @_; + my $nl = $opt->{threads} ? locals($self) : 1; + my $nr = remotes($self); + $nr = $MAX_PER_HOST if $nr > $MAX_PER_HOST; + $nl + $nr; +} + +sub start_query { # always runs in main (lei-daemon) process + my ($self) = @_; + if ($self->{threads}) { + for my $ibxish (locals($self)) { + $self->wq_io_do('query_thread_mset', [], $ibxish); + } + } elsif (locals($self)) { + $self->wq_io_do('query_mset', []); + } + my $i = 0; + my $q = []; + for my $uri (remotes($self)) { + push @{$q->[$i++ % $MAX_PER_HOST]}, $uri; + } + for my $uris (@$q) { + $self->wq_io_do('query_remote_mboxrd', [], $uris); + } + $self->wq_close(1); # lei_xsearch workers stop when done +} + +sub incr_start_query { # called whenever an l2m shard starts do_post_auth + my ($self, $l2m) = @_; + return if ++$self->{nr_start_query} != $l2m->{-wq_nr_workers}; + start_query($self); +} + +sub ipc_atfork_child { + my ($self) = @_; + $self->{lei}->lei_atfork_child; + $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb(); + $self->SUPER::ipc_atfork_child; +} + sub do_query { - my ($self, $lei_orig, $srcs) = @_; - my ($lei, @io) = $lei_orig->atfork_parent_wq($self); - my $remotes = $self->{remotes} // []; - pipe(my ($eof_wait, $qry_done)) or die "pipe $!"; - $io[0] = $qry_done; # don't need stdin - - if ($lei->{opt}->{thread}) { - $lei->{-parallel} = scalar(@$remotes) + scalar(@$srcs) - 1; - for my $ibxish (@$srcs) { - $self->wq_do('query_thread_mset', \@io, $lei, $ibxish); + my ($self, $lei) = @_; + my $l2m = $lei->{l2m}; + my $ops = { + '|' => [ $lei->can('sigpipe_handler'), $lei ], + '!' => [ $lei->can('fail_handler'), $lei ], + '.' => [ \&do_post_augment, $lei ], + '+' => [ \&incr_post_augment, $lei ], + '' => [ \&query_done, $lei ], + 'mset_progress' => [ \&mset_progress, $lei ], + 'x_it' => [ $lei->can('x_it'), $lei ], + 'child_error' => [ $lei->can('child_error'), $lei ], + 'incr_start_query' => [ \&incr_start_query, $self, $l2m ], + }; + $lei->{auth}->op_merge($ops, $l2m) if $l2m && $lei->{auth}; + ($lei->{pkt_op_c}, $lei->{pkt_op_p}) = PublicInbox::PktOp->pair($ops); + $lei->{1}->autoflush(1); + $lei->start_pager if delete $lei->{need_pager}; + $lei->{ovv}->ovv_begin($lei); + if ($l2m) { + $l2m->pre_augment($lei); + if ($lei->{opt}->{augment} && delete $lei->{early_mua}) { + $lei->start_mua; } + $l2m->wq_workers_start('lei2mail', undef, + $lei->oldset, { lei => $lei }); + pipe($lei->{startq}, $lei->{au_done}) or die "pipe: $!"; + # 1031: F_SETPIPE_SZ + fcntl($lei->{startq}, 1031, 4096) if $^O eq 'linux'; + } + if (!$lei->{opt}->{threads} && locals($self)) { # for query_mset + # lei->{git_tmp} is set for wq_wait_old so we don't + # delete until all lei2mail + lei_xsearch workers are reaped + $lei->{git_tmp} = $self->{git_tmp} = git_tmp($self); + } + $self->wq_workers_start('lei_xsearch', undef, + $lei->oldset, { lei => $lei }); + my $op = delete $lei->{pkt_op_c}; + delete $lei->{pkt_op_p}; + $self->{threads} = $lei->{opt}->{threads}; + if ($l2m) { + $l2m->net_merge_complete unless $lei->{auth}; } else { - $lei->{-parallel} = scalar(@$remotes); - $self->wq_do('query_mset', \@io, $lei, $srcs); - } - # TODO - for my $rmt (@$remotes) { - $self->wq_do('query_thread_mbox', \@io, $lei, $rmt); - } - @io = (); - close $qry_done; # fully closed when children are done - - # query_done will run when query_*mset close $qry_done - if ($lei_orig->{sock}) { # watch for client premature exit - require PublicInbox::EOFpipe; - PublicInbox::EOFpipe->new($eof_wait, \&query_done, $lei_orig); - $lei_orig->{lxs} = $self; - $lei_orig->event_step_init; + start_query($self); + } + $lei->event_step_init; # wait for shutdowns + if ($lei->{oneshot}) { + while ($op->{sock}) { $op->event_step } + } +} + +sub add_uri { + my ($self, $uri) = @_; + if (my $curl = $self->{curl} //= which('curl') // 0) { + require PublicInbox::MboxReader; + require IO::Uncompress::Gunzip; + require PublicInbox::LeiCurl; + push @{$self->{remotes}}, $uri; } else { - $self->wq_close; - read($eof_wait, my $buf, 1); # wait for close($lei->{0}) - query_done($lei_orig); # may SIGPIPE + warn "curl missing, ignoring $uri\n"; } } -sub ipc_atfork_prepare { - my ($self) = @_; - $self->wq_set_recv_modes(qw[+<&= >&= >&= +<&=]); - $self->SUPER::ipc_atfork_prepare; # PublicInbox::IPC +sub prepare_external { + my ($self, $loc, $boost) = @_; # n.b. already ordered by boost + if (ref $loc) { # already a URI, or PublicInbox::Inbox-like object + return add_uri($self, $loc) if $loc->can('scheme'); + } elsif ($loc =~ m!\Ahttps?://!) { + require URI; + return add_uri($self, URI->new($loc)); + } elsif (-f "$loc/ei.lock") { + require PublicInbox::ExtSearch; + $loc = PublicInbox::ExtSearch->new($loc); + } elsif (-f "$loc/inbox.lock" || -d "$loc/public-inbox") { + require PublicInbox::Inbox; # v2, v1 + $loc = bless { inboxdir => $loc }, 'PublicInbox::Inbox'; + } else { + warn "W: ignoring $loc, unable to determine type\n"; + return; + } + push @{$self->{locals}}, $loc; } + 1;