daemons: revamp periodic cleanup task

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

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 1d1cd2f5de406babc8c823222d144043e6bd59f2..d285c11cf07058051202c7bda48a6cb7f66a7b87 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -199,7 +199,7 @@ sub xdb_shards_flat ($) {
        my (@xdb, $slow_phrase);
        load_xapian();
        $self->{qp_flags} //= $QP_FLAGS;
-       if ($xpfx =~ m/xapian${\SCHEMA_VERSION}\z/) {
+       if ($xpfx =~ m!/xapian[0-9]+\z!) {
                @xdb = ($X{Database}->new($xpfx));
                $self->{qp_flags} |= FLAG_PHRASE() if !-f "$xpfx/iamchert";
        } else {
@@ -243,6 +243,20 @@ sub xdb ($) {
        };
 }
 
+# returns true if a future rescan is desired
+sub cleanup_shards {
+       my ($self) = @_;
+       return unless exists($self->{xdb});
+       my $xpfx = $self->{xpfx};
+       return reopen($self) if $xpfx =~ m!/xapian[0-9]+\z!; # true
+       opendir(my $dh, $xpfx) or return warn("$xpfx gone: $!\n"); # true
+       my $nr = grep(/\A[0-9]+\z/, readdir($dh)) or
+               return warn("$xpfx has no shards\n"); # true
+       return reopen($self) if $nr == ($self->{nshard} // -1);
+       delete($self->{xdb});
+       undef;
+}
+
 sub new {
        my ($class, $ibx) = @_;
        ref $ibx or die "BUG: expected PublicInbox::Inbox object: $ibx";