searchidx: expose INDEXLEVELS as `our'

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

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 2c5c815f605755da79e5d551b088331b6bee5e86..af707ced473185230f04bc2025dfec5d34d306ed 100644 (file)
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -32,11 +32,11 @@ use constant DEBUG => !!$ENV{DEBUG};
 my $xapianlevels = qr/\A(?:full|medium)\z/;
 my $hex = '[a-f0-9]';
 my $OID = $hex .'{40,}';
+our $INDEXLEVELS = qr/\A(?:full|medium|basic)\z/;
 
 sub new {
        my ($class, $ibx, $creat, $shard) = @_;
        ref $ibx or die "BUG: expected PublicInbox::Inbox object: $ibx";
-       my $levels = qr/\A(?:full|medium|basic)\z/;
        my $inboxdir = $ibx->{inboxdir};
        my $version = $ibx->version;
        my $indexlevel = 'full';
@@ -46,7 +46,7 @@ sub new {
                $altid = [ map { PublicInbox::AltId->new($ibx, $_); } @$altid ];
        }
        if ($ibx->{indexlevel}) {
-               if ($ibx->{indexlevel} =~ $levels) {
+               if ($ibx->{indexlevel} =~ $INDEXLEVELS) {
                        $indexlevel = $ibx->{indexlevel};
                } else {
                        die("Invalid indexlevel $ibx->{indexlevel}\n");
@@ -587,8 +587,7 @@ sub check_size { # check_async cb for -index --max-size=...
 
 sub v1_checkpoint ($$;$) {
        my ($self, $sync, $stk) = @_;
-       $self->{ibx}->git->check_async_wait;
-       $self->{ibx}->git->cat_async_wait;
+       $self->{ibx}->git->async_wait_all;
 
        # latest_cmt may be undef
        my $newest = $stk ? $stk->{latest_cmt} : undef;