nntp: xref: simplify sub signature

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

diff --git a/lib/PublicInbox/ExtSearchIdx.pm b/lib/PublicInbox/ExtSearchIdx.pm
index 708f8a3e96cf4aa32674bf3f2a91dfa8288c4f0c..7ab0c4af64a9a3c5951cf796bd017f51d3984947 100644 (file)
--- a/lib/PublicInbox/ExtSearchIdx.pm
+++ b/lib/PublicInbox/ExtSearchIdx.pm
@@ -298,7 +298,7 @@ sub _sync_inbox ($$$) {
                my $epoch_max;
                defined($ibx->git_dir_latest(\$epoch_max)) or return;
                $sync->{epoch_max} = $epoch_max;
-               sync_prepare($self, $sync) or return; # fills $sync->{todo}
+               sync_prepare($self, $sync); # or return # TODO: once MiscIdx is stable
        } elsif ($v == 1) {
                my $uv = $ibx->uidvalidity;
                my $lc = $self->{oidx}->eidx_meta("lc-v1:$ekey//$uv");
@@ -309,8 +309,11 @@ sub _sync_inbox ($$$) {
                warn "E: $ekey unsupported inbox version (v$v)\n";
                return;
        }
-       index_todo($self, $sync, $_) for @{delete($sync->{todo}) // []};
-       $self->{midx}->index_ibx($ibx);
+       unless ($sync->{quit}) {
+               index_todo($self, $sync, $_) for @{delete($sync->{todo}) // []};
+               $self->{midx}->index_ibx($ibx) unless $sync->{quit};
+       }
+       $ibx->git->cleanup; # done with this inbox, now
 }
 
 sub eidx_sync { # main entry point
@@ -393,18 +396,28 @@ sub idx_init { # similar to V2Writable
        my $info_dir = "$ALL/objects/info";
        my $alt = "$info_dir/alternates";
        my $mode = 0644;
-       my (%old, @old, %new, @new);
+       my (@old, @new, %seen); # seen: st_dev + st_ino
        if (-e $alt) {
                open(my $fh, '<', $alt) or die "open $alt: $!";
                $mode = (stat($fh))[2] & 07777;
-               while (<$fh>) {
-                       push @old, $_ if !$old{$_}++;
+               while (my $line = <$fh>) {
+                       chomp(my $d = $line);
+                       if (my @st = stat($d)) {
+                               next if $seen{"$st[0]\0$st[1]"}++;
+                       } else {
+                               warn "W: stat($d) failed (from $alt): $!\n";
+                       }
+                       push @old, $line;
                }
        }
        for my $ibx (@{$self->{ibx_list}}) {
                my $line = $ibx->git->{git_dir} . "/objects\n";
-               next if $old{$line};
-               $new{$line} = 1;
+               chomp(my $d = $line);
+               if (my @st = stat($d)) {
+                       next if $seen{"$st[0]\0$st[1]"}++;
+               } else {
+                       warn "W: stat($d) failed (from $ibx->{inboxdir}): $!\n";
+               }
                push @new, $line;
        }
        if (scalar @new) {