X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconvert-compact.t;h=7270cab082838539e81cf2d6294abd85a3a29309;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=c6da64eaa69daf0ab0bf9f3b1c1ce654c2b06ea4;hpb=3c313f9034aac96182e2efdc2f92c40803626f32;p=public-inbox.git diff --git a/t/convert-compact.t b/t/convert-compact.t index c6da64ea..7270cab0 100644 --- a/t/convert-compact.t +++ b/t/convert-compact.t @@ -1,55 +1,41 @@ -# Copyright (C) 2018-2019 all contributors +#!perl -w +# Copyright (C) 2018-2021 all contributors # License: AGPL-3.0+ use strict; -use warnings; -use Test::More; -use PublicInbox::MIME; -use PublicInbox::Spawn qw(which); +use v5.10.1; +use PublicInbox::Eml; use PublicInbox::TestCommon; +use PublicInbox::Import; require_git(2.6); -my @mods = qw(DBD::SQLite Search::Xapian); -foreach my $mod (@mods) { - eval "require $mod"; - plan skip_all => "$mod missing for convert-compact.t" if $@; -} -which('xapian-compact') or +require_mods(qw(DBD::SQLite Search::Xapian)); +have_xapian_compact or plan skip_all => 'xapian-compact missing for '.__FILE__; - -use_ok 'PublicInbox::V2Writable'; -use PublicInbox::Import; my ($tmpdir, $for_destroy) = tmpdir(); -my $ibx = { - inboxdir => "$tmpdir/v1", - name => 'test-v1', - -primary_address => 'test@example.com', -}; - -ok(PublicInbox::Import::run_die([qw(git init --bare -q), $ibx->{inboxdir}]), - 'initialized v1 repo'); -ok(umask(077), 'set restrictive umask'); -ok(PublicInbox::Import::run_die([qw(git) , "--git-dir=$ibx->{inboxdir}", - qw(config core.sharedRepository 0644)]), 'set sharedRepository'); -$ibx = PublicInbox::Inbox->new($ibx); -my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx); -my $mime = PublicInbox::MIME->create( - header => [ - From => 'a@example.com', - To => 'test@example.com', - Subject => 'this is a subject', - 'Message-ID' => '', - Date => 'Fri, 02 Oct 1993 00:00:00 +0000', - ], - body => "hello world\n", -); -ok($im->add($mime), 'added one message'); -ok($im->remove($mime), 'remove message'); -ok($im->add($mime), 'added message again'); -$im->done; -for (1..2) { - eval { PublicInbox::SearchIdx->new($ibx, 1)->index_sync; }; - is($@, '', 'no errors syncing'); -} +my $ibx = create_inbox 'v1', indexlevel => 'medium', tmpdir => "$tmpdir/v1", + pre_cb => sub { + my ($inboxdir) = @_; + PublicInbox::Import::init_bare($inboxdir); + xsys_e(qw(git) , "--git-dir=$inboxdir", + qw(config core.sharedRepository 0644)); + }, sub { + my ($im, $ibx) = @_; + $im->done; + umask(077) or BAIL_OUT "umask: $!"; + $_[0] = $im = $ibx->importer(0); + my $eml = PublicInbox::Eml->new(<<'EOF'); +From: a@example.com +To: b@example.com +Subject: this is a subject +Message-ID: +Date: Fri, 02 Oct 1993 00:00:00 +0000 +hello world +EOF + $im->add($eml) or BAIL_OUT '->add'; + $im->remove($eml) or BAIL_OUT '->remove'; + $im->add($eml) or BAIL_OUT '->add'; +}; +umask(077) or BAIL_OUT "umask: $!"; is(((stat("$ibx->{inboxdir}/public-inbox"))[2]) & 07777, 0755, 'sharedRepository respected for v1'); is(((stat("$ibx->{inboxdir}/public-inbox/msgmap.sqlite3"))[2]) & 07777, 0644, @@ -73,32 +59,43 @@ is(scalar(@xdir), 1, 'got one xapian directory after compact'); is(((stat($xdir[0]))[2]) & 07777, 0755, 'sharedRepository respected on v1 compact'); -$cmd = [ '-convert', $ibx->{inboxdir}, "$tmpdir/v2" ]; +my $hwm = do { + my $mm = $ibx->mm; + $ibx->cleanup; + $mm->num_highwater; +}; +ok(defined($hwm) && $hwm > 0, "highwater mark set #$hwm"); + +$cmd = [ '-convert', '--no-index', $ibx->{inboxdir}, "$tmpdir/no-index" ]; +ok(run_script($cmd, undef, $rdr), 'convert --no-index works'); + +$cmd = [ '-convert', $ibx->{inboxdir}, "$tmpdir/x/v2" ]; ok(run_script($cmd, undef, $rdr), 'convert works'); -@xdir = glob("$tmpdir/v2/xap*/*"); +@xdir = glob("$tmpdir/x/v2/xap*/*"); foreach (@xdir) { my @st = stat($_); is($st[2] & 07777, -f _ ? 0644 : 0755, 'sharedRepository respected after convert'); } -$cmd = [ '-compact', "$tmpdir/v2" ]; +$cmd = [ '-compact', "$tmpdir/x/v2" ]; my $env = { NPROC => 2 }; ok(run_script($cmd, $env, $rdr), 'v2 compact works'); -$ibx->{inboxdir} = "$tmpdir/v2"; +$ibx->{inboxdir} = "$tmpdir/x/v2"; $ibx->{version} = 2; +is($ibx->mm->num_highwater, $hwm, 'highwater mark unchanged in v2 inbox'); -@xdir = glob("$tmpdir/v2/xap*/*"); +@xdir = glob("$tmpdir/x/v2/xap*/*"); foreach (@xdir) { my @st = stat($_); is($st[2] & 07777, -f _ ? 0644 : 0755, 'sharedRepository respected after v2 compact'); } -is(((stat("$tmpdir/v2/msgmap.sqlite3"))[2]) & 07777, 0644, +is(((stat("$tmpdir/x/v2/msgmap.sqlite3"))[2]) & 07777, 0644, 'sharedRepository respected for v2 msgmap'); -@xdir = (glob("$tmpdir/v2/git/*.git/objects/*/*"), - glob("$tmpdir/v2/git/*.git/objects/pack/*")); +@xdir = (glob("$tmpdir/x/v2/git/*.git/objects/*/*"), + glob("$tmpdir/x/v2/git/*.git/objects/pack/*")); foreach (@xdir) { my @st = stat($_); is($st[2] & 07777, -f _ ? 0444 : 0755, @@ -108,4 +105,16 @@ my $msgs = $ibx->recent({limit => 1000}); is($msgs->[0]->{mid}, 'a-mid@b', 'message exists in history'); is(scalar @$msgs, 1, 'only one message in history'); +$ibx = undef; +$err = ''; +$cmd = [ qw(-index -j0 --reindex -c), "$tmpdir/x/v2" ]; +ok(run_script($cmd, undef, $rdr), '--reindex -c'); +like($err, qr/xapian-compact/, 'xapian-compact ran (-c)'); + +$rdr->{2} = \(my $err2 = ''); +$cmd = [ qw(-index -j0 --reindex -cc), "$tmpdir/x/v2" ]; +ok(run_script($cmd, undef, $rdr), '--reindex -c -c'); +like($err2, qr/xapian-compact/, 'xapian-compact ran (-c -c)'); +ok(($err2 =~ tr/\n/\n/) > ($err =~ tr/\n/\n/), '-compacted twice'); + done_testing();