lei + ipc: simplify process reaping

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

diff --git a/lib/PublicInbox/LeiInspect.pm b/lib/PublicInbox/LeiInspect.pm
index 2158b996a3a48654bef125ec1c990f8193ffb9e1..05b6e21d298d66e5723dfe5e7faeb17e4317ffc4 100644 (file)
--- a/lib/PublicInbox/LeiInspect.pm
+++ b/lib/PublicInbox/LeiInspect.pm
@@ -13,6 +13,12 @@ use PublicInbox::Config;
 use PublicInbox::MID qw(mids);
 use PublicInbox::NetReader qw(imap_uri nntp_uri);
 
+sub _json_prep ($) {
+       my ($smsg) = @_;
+       $smsg->{$_} += 0 for qw(bytes lines); # integerize
+       +{ %$smsg } # unbless and scalarize
+}
+
 sub inspect_blob ($$) {
        my ($lei, $oidhex) = @_;
        my $ent = {};
@@ -72,22 +78,9 @@ sub inspect_sync_folder ($$) {
        $ent
 }
 
-sub inspect_docid ($$;$) {
-       my ($lei, $docid, $ent) = @_;
-       require PublicInbox::Search;
-       $ent //= {};
-       my $xdb;
-       if ($xdb = delete $ent->{xdb}) { # from inspect_num
-       } elsif (defined(my $dir = $lei->{opt}->{dir})) {
-               no warnings 'once';
-               $xdb = $PublicInbox::Search::X{Database}->new($dir);
-       } else {
-               $xdb = $lei->{lse}->xdb;
-       }
-       $xdb or return $lei->fail('no Xapian DB');
-       my $doc = $xdb->get_document($docid); # raises
+sub _inspect_doc ($$) {
+       my ($ent, $doc) = @_;
        my $data = $doc->get_data;
-       $ent->{docid} = $docid;
        $ent->{data_length} = length($data);
        $ent->{description} = $doc->get_description;
        $ent->{$_} = $doc->$_ for (qw(termlist_count values_count));
@@ -113,6 +106,24 @@ sub inspect_docid ($$;$) {
        $ent;
 }
 
+sub inspect_docid ($$;$) {
+       my ($lei, $docid, $ent) = @_;
+       require PublicInbox::Search;
+       $ent //= {};
+       my $xdb;
+       if ($xdb = delete $ent->{xdb}) { # from inspect_num
+       } elsif (defined(my $dir = $lei->{opt}->{dir})) {
+               no warnings 'once';
+               $xdb = $PublicInbox::Search::X{Database}->new($dir);
+       } elsif ($lei->{lse}) {
+               $xdb = $lei->{lse}->xdb;
+       }
+       $xdb or return $lei->fail('no Xapian DB');
+       my $doc = $xdb->get_document($docid); # raises
+       $ent->{docid} = $docid;
+       _inspect_doc($ent, $doc);
+}
+
 sub dir2ibx ($$) {
        my ($lei, $dir) = @_;
        if (-f "$dir/ei.lock") {
@@ -132,39 +143,43 @@ sub inspect_num ($$) {
        my $ent = { num => $num };
        if (defined(my $dir = $lei->{opt}->{dir})) {
                $ibx = dir2ibx($lei, $dir) or return;
-               if ($ent->{xdb} = $ibx->xdb) {
-                       my $num2docid = $lei->{lse}->can('num2docid');
-                       $docid = $num2docid->($ibx, $num);
+               if (my $srch = $ibx->search) {
+                       $ent->{xdb} = $srch->xdb and
+                               $docid = $srch->num2docid($num);
                }
-       } else {
+       } elsif ($lei->{lse}) {
                $ibx = $lei->{lse};
                $lei->{lse}->xdb; # set {nshard} for num2docid
                $docid = $lei->{lse}->num2docid($num);
        }
        if ($ibx && $ibx->over) {
                my $smsg = $ibx->over->get_art($num);
-               $ent->{smsg} = { %$smsg } if $smsg;
+               $ent->{smsg} = _json_prep($smsg) if $smsg;
        }
        defined($docid) ? inspect_docid($lei, $docid, $ent) : $ent;
 }
 
 sub inspect_mid ($$) {
        my ($lei, $mid) = @_;
-       my ($ibx, $over);
+       my $ibx;
        my $ent = { mid => $mid };
        if (defined(my $dir = $lei->{opt}->{dir})) {
-               my $num2docid = $lei->{lse}->can('num mid => [ $mid ] 2docid');
-               $ibx = dir2ibx($lei, $dir) or return;
-               # $ent->{xdb} = $ibx->xdb //
-                       # return $lei->fail("no Xapian DB for $dir");
+               $ibx = dir2ibx($lei, $dir)
        } else {
                $ibx = $lei->{lse};
-               $lei->{lse}->xdb; # set {nshard} for num2docid
        }
        if ($ibx && $ibx->over) {
                my ($id, $prev);
                while (my $smsg = $ibx->over->next_by_mid($mid, \$id, \$prev)) {
-                       push @{$ent->{smsg}}, { %$smsg }
+                       push @{$ent->{smsg}}, _json_prep($smsg);
+               }
+       }
+       if ($ibx && $ibx->search) {
+               my $mset = $ibx->search->mset(qq{mid:"$mid"});
+               for (sort { $a->get_docid <=> $b->get_docid } $mset->items) {
+                       my $tmp = { docid => $_->get_docid };
+                       _inspect_doc($tmp, $_->get_document);
+                       push @{$ent->{xdoc}}, $tmp;
                }
        }
        $ent;
@@ -227,7 +242,7 @@ sub inspect_start ($$) {
        $lei->{wq1} = $self;
        $lei->wait_wq_events($op_c, $ops);
        $self->wq_do('inspect_argv');
-       $self->wq_close(1);
+       $self->wq_close;
 }
 
 sub ins_add { # InputPipe->consume callback