X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconvert-compact.t;h=def09567fefdcdabf8d48100dd5ef1841d2700dd;hb=115d59641bda19405a3ed82dc72e129f9196fad5;hp=922ec9c2daa7f0d8f43cf6925169ff37d82740f9;hpb=e5c2e2588d7ad2243afeabad67b3c951c5b66643;p=public-inbox.git
diff --git a/t/convert-compact.t b/t/convert-compact.t
index 922ec9c2..def09567 100644
--- a/t/convert-compact.t
+++ b/t/convert-compact.t
@@ -1,57 +1,120 @@
-# Copyright (C) 2018 all contributors
+#!perl -w
+# Copyright (C) 2018-2021 all contributors
# License: AGPL-3.0+
use strict;
-use warnings;
-use Test::More;
-use File::Temp qw/tempdir/;
-use PublicInbox::MIME;
-my @mods = qw(DBD::SQLite Search::Xapian);
-foreach my $mod (@mods) {
- eval "require $mod";
- plan skip_all => "$mod missing for convert-compact.t" if $@;
-}
-use PublicInbox::V2Writable;
+use v5.10.1;
+use PublicInbox::Eml;
+use PublicInbox::TestCommon;
use PublicInbox::Import;
-my $tmpdir = tempdir('convert-compact-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-my $ibx = {
- mainrepo => "$tmpdir/v1",
- name => 'test-v1',
- -primary_address => 'test@example.com',
+require_git(2.6);
+require_mods(qw(DBD::SQLite Search::Xapian));
+have_xapian_compact or
+ plan skip_all => 'xapian-compact missing for '.__FILE__;
+my ($tmpdir, $for_destroy) = tmpdir();
+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,
+ 'sharedRepository respected for v1 msgmap');
+my @xdir = glob("$ibx->{inboxdir}/public-inbox/xap*/*");
+foreach (@xdir) {
+ my @st = stat($_);
+ is($st[2] & 07777, -f _ ? 0644 : 0755,
+ 'sharedRepository respected on file after convert');
+}
+
+local $ENV{PI_CONFIG} = '/dev/null';
+my ($out, $err) = ('', '');
+my $rdr = { 1 => \$out, 2 => \$err };
+
+my $cmd = [ '-compact', $ibx->{inboxdir} ];
+ok(run_script($cmd, undef, $rdr), 'v1 compact works');
+
+@xdir = glob("$ibx->{inboxdir}/public-inbox/xap*");
+is(scalar(@xdir), 1, 'got one xapian directory after compact');
+is(((stat($xdir[0]))[2]) & 07777, 0755,
+ 'sharedRepository respected on v1 compact');
+
+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');
-ok(PublicInbox::Import::run_die([qw(git init --bare -q), $ibx->{mainrepo}]),
- 'initialized v1 repo');
-$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');
-$im->done;
-PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
-local $ENV{PATH} = "blib/script:$ENV{PATH}";
-open my $err, '>>', "$tmpdir/err.log" or die "open: err.log $!\n";
-open my $out, '>>', "$tmpdir/out.log" or die "open: out.log $!\n";
-my $rdr = { 1 => fileno($out), 2 => fileno($err) };
-
-my $cmd = [ 'public-inbox-compact', $ibx->{mainrepo} ];
-ok(PublicInbox::Import::run_die($cmd, undef, $rdr), 'v1 compact works');
-
-$cmd = [ 'public-inbox-convert', $ibx->{mainrepo}, "$tmpdir/v2" ];
-ok(PublicInbox::Import::run_die($cmd, undef, $rdr), 'convert works');
-
-$cmd = [ 'public-inbox-compact', "$tmpdir/v2" ];
+$cmd = [ '-convert', $ibx->{inboxdir}, "$tmpdir/x/v2" ];
+ok(run_script($cmd, undef, $rdr), 'convert works');
+@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/x/v2" ];
my $env = { NPROC => 2 };
-ok(PublicInbox::Import::run_die($cmd, $env, $rdr), 'v2 compact works');
-$ibx->{mainrepo} = "$tmpdir/v2";
-my $v2w = PublicInbox::V2Writable->new($ibx);
-is($v2w->{partitions}, 1, "only one partition in compacted repo");
+ok(run_script($cmd, $env, $rdr), 'v2 compact works');
+$ibx->{inboxdir} = "$tmpdir/x/v2";
+$ibx->{version} = 2;
+is($ibx->mm->num_highwater, $hwm, 'highwater mark unchanged in v2 inbox');
+
+@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/x/v2/msgmap.sqlite3"))[2]) & 07777, 0644,
+ 'sharedRepository respected for v2 msgmap');
+
+@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,
+ 'sharedRepository respected after v2 compact');
+}
+my $msgs = $ibx->over->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();