cindex: basic inboxes are non-fatal for --associate

We need to gracefully continue when a user tries to associate
with --all but has basic (or completely unindexed) inboxes.

diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm
index 2d1d8b223cd4e24df7e51aa236f8a01b78428e68..c8e4c591504cf34f18841fd2c3aff62adacfb6f4 100644 (file)
--- a/lib/PublicInbox/CodeSearchIdx.pm
+++ b/lib/PublicInbox/CodeSearchIdx.pm
@@ -551,12 +551,14 @@ sub dump_roots_start {
 sub dump_ibx { # sends to xap_helper.h
        my ($self, $ibx_id) = @_;
        my $ibx = $IBX[$ibx_id] // die "BUG: no IBX[$ibx_id]";
-       my @cmd = ('dump_ibx', $ibx->isrch->xh_args,
-                       (map { ('-A', $_) } @ASSOC_PFX),
-                       $ibx_id, $QRY_STR);
+       my $ekey = $ibx->eidx_key;
+       my $srch = $ibx->isrch or return warn <<EOM;
+W: $ekey not indexed for search
+EOM
+       my @cmd = ('dump_ibx', $srch->xh_args,
+                       (map { ('-A', $_) } @ASSOC_PFX), $ibx_id, $QRY_STR);
        pipe(my $r, my $w);
        $XHC->mkreq([$DUMP_IBX_WPIPE, $w], @cmd);
-       my $ekey = $ibx->eidx_key;
        $self->{PENDING}->{$ekey} = $TODO{associate};
        PublicInbox::CidxXapHelperAux->new($r, $self, $ekey);
 }

diff --git a/t/cindex.t b/t/cindex.t
index 51317329afbf85921c7e82511dc887ef28b031a3..c7de150541d9ca8234208a735b515ee5d8bf95f5 100644 (file)
--- a/t/cindex.t
+++ b/t/cindex.t
@@ -198,4 +198,25 @@ SKIP: {
        ok(run_script([qw(-xcpdb --compact), "$tmp/ext"]), 'xcpdb compact');
 };
 
+my $basic = create_inbox 'basic', indexlevel => 'basic', sub {
+       my ($im, $ibx) = @_;
+       $im->add(eml_load('t/plack-qp.eml'));
+};
+{
+       my $env = { PI_CONFIG => "$tmp/pi_config" };
+       open my $fh, '>', $env->{PI_CONFIG};
+       print $fh <<EOM;
+[publicinbox "basictest"]
+       inboxdir = $basic->{inboxdir}
+       address = basic\@example.com
+EOM
+       close $fh;
+       my $cmd = [ qw(-cindex -u --all --associate -d), "$tmp/ext",
+               '-I', $basic->{inboxdir} ];
+       my $opt = { 1 => \(my $cidx_out), 2 => \(my $cidx_err) };
+       ok(run_script($cmd, $env, $opt), 'associate w/o search');
+       like($cidx_err, qr/W: \Q$basic->{inboxdir}\E not indexed for search/,
+               'non-Xapian-enabled inbox noted');
+}
+
 done_testing;