lei: All Local Externals: bare git dir for alternates

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

diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index d4607e16a331c72b270bcf90598cc2f2067dea2b..1266b3b3396f9466b5eb26759f7e857baaf7ffb7 100644 (file)
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -92,11 +92,16 @@ sub recent {
        my ($self, $qstr, $opt) = @_;
        $opt //= {};
        $opt->{relevance} //= -2;
-       $self->mset($qstr //= 'bytes:1..', $opt);
+       $self->mset($qstr //= 'z:1..', $opt);
 }
 
 sub over {}
 
+sub overs_all { # for xids_for
+       my ($self) = @_;
+       grep(defined, map { $_->over } locals($self))
+}
+
 sub _mset_more ($$) {
        my ($mset, $mo) = @_;
        my $size = $mset->size;
@@ -148,7 +153,7 @@ sub query_thread_mset { # for --threads
        my $mset;
        my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei, $ibxish);
        my $can_kw = !!$ibxish->can('msg_keywords');
-       my $fl = $lei->{opt}->{threads} > 1;
+       my $fl = $lei->{opt}->{threads} > 1 ? [ 'flagged' ] : undef;
        do {
                $mset = $srch->mset($mo->{qstr}, $mo);
                mset_progress($lei, $desc, $mset->size,
@@ -165,8 +170,8 @@ sub query_thread_mset { # for --threads
                                if ($mitem) {
                                        if ($can_kw) {
                                                mitem_kw($smsg, $mitem, $fl);
-                                       } else {
-                                               $smsg->{kw} = [ 'flagged' ];
+                                       } elsif ($fl) {
+                                               $smsg->{kw} = $fl;
                                        }
                                }
                                $each_smsg->($smsg, $mitem);
@@ -204,7 +209,9 @@ sub query_mset { # non-parallel for non-"--threads" users
 
 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
+       if (my $sto = $self->{import_sto}) {
+               $sto->ipc_do('add_eml_maybe', $eml);
+       }
        my $smsg = bless {}, 'PublicInbox::Smsg';
        $smsg->populate($eml);
        $smsg->parse_references($eml, mids($eml));
@@ -249,6 +256,7 @@ sub query_remote_mboxrd {
        my $curl = PublicInbox::LeiCurl->new($lei, $self->{curl}) or return;
        push @$curl, '-s', '-d', '';
        my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei);
+       $self->{import_sto} = $lei->{sto} if $lei->{opt}->{'import-remote'};
        for my $uri (@$uris) {
                $lei->{-current_url} = $uri->as_string;
                $lei->{-nr_remote_eml} = 0;
@@ -289,27 +297,7 @@ sub query_remote_mboxrd {
        $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 git { $_[0]->{git} // die 'BUG: git uninitialized' }
 
 sub xsearch_done_wait { # dwaitpid callback
        my ($arg, $pid) = @_;
@@ -416,6 +404,11 @@ sub ipc_atfork_child {
        $self->SUPER::ipc_atfork_child;
 }
 
+sub delete_pkt_op { # OnDestroy callback
+       my $unclosed_after_die = delete($_[0])->{pkt_op_p} or return;
+       close $unclosed_after_die;
+}
+
 sub do_query {
        my ($self, $lei) = @_;
        my $l2m = $lei->{l2m};
@@ -431,6 +424,7 @@ sub do_query {
                'incr_start_query' => [ \&incr_start_query, $self, $l2m ],
        };
        $lei->{auth}->op_merge($ops, $l2m) if $l2m && $lei->{auth};
+       my $od = PublicInbox::OnDestroy->new($$, \&delete_pkt_op, $lei);
        ($lei->{pkt_op_c}, $lei->{pkt_op_p}) = PublicInbox::PktOp->pair($ops);
        $lei->{1}->autoflush(1);
        $lei->start_pager if delete $lei->{need_pager};
@@ -446,11 +440,6 @@ sub do_query {
                # 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};
@@ -488,8 +477,10 @@ sub prepare_external {
                return add_uri($self, URI->new($loc));
        } elsif (-f "$loc/ei.lock") {
                require PublicInbox::ExtSearch;
+               die "`\\n' not allowed in `$loc'\n" if index($loc, "\n") >= 0;
                $loc = PublicInbox::ExtSearch->new($loc);
        } elsif (-f "$loc/inbox.lock" || -d "$loc/public-inbox") {
+               die "`\\n' not allowed in `$loc'\n" if index($loc, "\n") >= 0;
                require PublicInbox::Inbox; # v2, v1
                $loc = bless { inboxdir => $loc }, 'PublicInbox::Inbox';
        } else {