X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=477621e24d011449e611f14caf567b32cfb645ab;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=f171417513440fb578382a1471ba3e13544af26c;hpb=a6823087e5aa9699a42c31df16323885c70d1b4d;p=public-inbox.git diff --git a/t/v2writable.t b/t/v2writable.t index f1714175..477621e2 100644 --- a/t/v2writable.t +++ b/t/v2writable.t @@ -1,47 +1,41 @@ -# Copyright (C) 2018 all contributors +# Copyright (C) 2018-2021 all contributors # License: AGPL-3.0+ use strict; use warnings; use Test::More; -use PublicInbox::MIME; -use PublicInbox::ContentId qw(content_digest); -use File::Temp qw/tempdir/; -require './t/common.perl'; +use PublicInbox::Eml; +use PublicInbox::ContentHash qw(content_digest content_hash); +use PublicInbox::TestCommon; +use Cwd qw(abs_path); require_git(2.6); -foreach my $mod (qw(DBD::SQLite Search::Xapian)) { - eval "require $mod"; - plan skip_all => "$mod missing for nntpd.t" if $@; -} +require_mods(qw(DBD::SQLite Search::Xapian)); +local $ENV{HOME} = abs_path('t'); use_ok 'PublicInbox::V2Writable'; umask 007; -my $mainrepo = tempdir('pi-v2writable-XXXXXX', TMPDIR => 1, CLEANUP => 1); +my ($inboxdir, $for_destroy) = tmpdir(); my $ibx = { - mainrepo => $mainrepo, + inboxdir => $inboxdir, name => 'test-v2writable', version => 2, + -no_fsync => 1, -primary_address => 'test@example.com', }; $ibx = PublicInbox::Inbox->new($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", -); +my $mime = PublicInbox::Eml->new(<<'EOF'); +From: a@example.com +To: test@example.com +Subject: this is a subject +Message-ID: +Date: Fri, 02 Oct 1993 00:00:00 +0000 -my $im = eval { - local $ENV{NPROC} = '1'; - PublicInbox::V2Writable->new($ibx, 1); -}; -is($im->{partitions}, 1, 'one partition when forced'); +hello world +EOF +my $im = PublicInbox::V2Writable->new($ibx, {nproc => 1}); +is($im->{shards}, 1, 'one shard when forced'); ok($im->add($mime), 'ordinary message added'); -foreach my $f ("$mainrepo/msgmap.sqlite3", - glob("$mainrepo/xap*/*"), - glob("$mainrepo/xap*/*/*")) { +foreach my $f ("$inboxdir/msgmap.sqlite3", + glob("$inboxdir/xap*/*"), + glob("$inboxdir/xap*/*/*")) { my @st = stat($f); my ($bn) = (split(m!/!, $f))[-1]; is($st[2] & 07777, -f _ ? 0660 : 0770, @@ -51,10 +45,10 @@ foreach my $f ("$mainrepo/msgmap.sqlite3", my $git0; if ('ensure git configs are correct') { - my @cmd = (qw(git config), "--file=$mainrepo/all.git/config", + my @cmd = (qw(git config), "--file=$inboxdir/all.git/config", qw(core.sharedRepository 0644)); - is(system(@cmd), 0, "set sharedRepository in all.git"); - $git0 = PublicInbox::Git->new("$mainrepo/git/0.git"); + is(xsys(@cmd), 0, "set sharedRepository in all.git"); + $git0 = PublicInbox::Git->new("$inboxdir/git/0.git"); chomp(my $v = $git0->qx(qw(config core.sharedRepository))); is($v, '0644', 'child repo inherited core.sharedRepository'); chomp($v = $git0->qx(qw(config --bool repack.writeBitmaps))); @@ -70,7 +64,7 @@ if ('ensure git configs are correct') { @warn = (); $mime->header_set('Message-Id', '', ''); is($im->add($mime), undef, 'secondary MID ignored if first matches'); - my $sec = PublicInbox::MIME->new($mime->as_string); + my $sec = PublicInbox::Eml->new($mime->as_string); $sec->header_set('Date'); $sec->header_set('Message-Id', '', ''); ok($im->add($sec), 'secondary MID used if data is different'); @@ -97,7 +91,7 @@ if ('ensure git configs are correct') { my $hdr = $mime->header_obj; my $gen = PublicInbox::Import::digest2mid(content_digest($mime), $hdr); unlike($gen, qr![\+/=]!, 'no URL-unfriendly chars in Message-Id'); - my $fake = PublicInbox::MIME->new($mime->as_string); + my $fake = PublicInbox::Eml->new($mime->as_string); $fake->header_set('Message-Id', "<$gen>"); ok($im->add($fake), 'fake added easily'); is_deeply(\@warn, [], 'no warnings from a faker'); @@ -114,58 +108,68 @@ if ('ensure git configs are correct') { @mids = $mime->header_obj->header_raw('Message-Id'); like($mids[0], $sane_mid, 'mid was generated'); is(scalar(@mids), 1, 'new generated'); + + @warn = (); + $mime->header_set('Message-Id', ''); + ok($im->add($mime), 'message added with space in Message-Id'); + is_deeply([], \@warn); } { $mime->header_set('Message-Id', '', ''); + $mime->header_set('X-Alt-Message-Id', ''); $mime->header_set('References', ''); ok($im->add($mime), 'message with multiple Message-ID'); $im->done; - my $srch = $ibx->search; - my $mset1 = $srch->reopen->query('m:abcde@1', { mset => 1 }); + my $total = $ibx->over->dbh->selectrow_array(<<''); +SELECT COUNT(*) FROM over WHERE num > 0 + + is($ibx->mm->num_highwater, $total, 'got expected highwater value'); + my $mset1 = $ibx->search->reopen->mset('m:abcde@1'); is($mset1->size, 1, 'message found by first MID'); - my $mset2 = $srch->reopen->query('m:abcde@2', { mset => 1 }); + my $mset2 = $ibx->search->mset('m:abcde@2'); is($mset2->size, 1, 'message found by second MID'); is((($mset1->items)[0])->get_docid, (($mset2->items)[0])->get_docid, 'same document') if ($mset1->size); + + my $alt = $ibx->search->mset('m:alt-id-for-nntp'); + is($alt->size, 1, 'message found by alt MID (NNTP)'); + is((($alt->items)[0])->get_docid, (($mset1->items)[0])->get_docid, + 'same document') if ($mset1->size); + $mime->header_set('X-Alt-Message-Id'); + + my %uniq; + for my $mid (qw(abcde@1 abcde@2 alt-id-for-nntp)) { + my $msgs = $ibx->over->get_thread($mid); + my $key = join(' ', sort(map { $_->{num} } @$msgs)); + $uniq{$key}++; + } + is(scalar(keys(%uniq)), 1, 'all alt Message-ID queries give same smsg'); + is_deeply([values(%uniq)], [3], '3 queries, 3 results'); } -SKIP: { +{ use Net::NNTP; - use IO::Socket; - use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY); - eval { require Danga::Socket }; - skip "Danga::Socket missing $@", 2 if $@; - my $err = "$mainrepo/stderr.log"; - my $out = "$mainrepo/stdout.log"; - my %opts = ( - LocalAddr => '127.0.0.1', - ReuseAddr => 1, - Proto => 'tcp', - Type => SOCK_STREAM, - Listen => 1024, - ); + my $err = "$inboxdir/stderr.log"; + my $out = "$inboxdir/stdout.log"; my $group = 'inbox.comp.test.v2writable'; - my $pi_config = "$mainrepo/pi_config"; + my $pi_config = "$inboxdir/pi_config"; open my $fh, '>', $pi_config or die "open: $!\n"; print $fh <new(%opts); - ok($sock, 'sock created'); - my $pid; + my $sock = tcp_server(); my $len; - END { kill 'TERM', $pid if defined $pid }; - my $nntpd = 'blib/script/public-inbox-nntpd'; - my $cmd = [ $nntpd, "--stdout=$out", "--stderr=$err" ]; - $pid = spawn_listener({ PI_CONFIG => $pi_config }, $cmd, [ $sock ]); - my $host_port = $sock->sockhost . ':' . $sock->sockport; + my $cmd = [ '-nntpd', '-W0', "--stdout=$out", "--stderr=$err" ]; + my $env = { PI_CONFIG => $pi_config }; + my $td = start_script($cmd, $env, { 3 => $sock }); + my $host_port = tcp_host_port($sock); my $n = Net::NNTP->new($host_port); $n->group($group); my $x = $n->xover('1-'); @@ -175,8 +179,13 @@ EOF is($uniq{$mid}++, 0, "MID for $num is unique in XOVER"); is_deeply($n->xhdr('Message-ID', $num), { $num => $mid }, "XHDR lookup OK on num $num"); + + # FIXME PublicInbox::NNTP (server) doesn't handle spaces in + # Message-ID, but neither does Net::NNTP (client) + next if $mid =~ / /; + is_deeply($n->xhdr('Message-ID', $mid), - { $mid => $mid }, "XHDR lookup OK on MID $num"); + { $mid => $mid }, "XHDR lookup OK on MID $mid ($num)"); } my %nn; foreach my $mid (@{$n->newnews(0, $group)}) { @@ -201,28 +210,30 @@ EOF is_deeply([sort keys %lg], [sort keys %$rover], 'XROVER range OK'); }; { - local $ENV{NPROC} = 2; my @log = qw(log --no-decorate --no-abbrev --no-notes --no-color); my @before = $git0->qx(@log, qw(--pretty=oneline)); my $before = $git0->qx(@log, qw(--pretty=raw --raw -r)); - $im = PublicInbox::V2Writable->new($ibx, 1); - is($im->{partitions}, 1, 'detected single partition from previous'); - my $smsg = $im->remove($mime, 'test removal'); + $im = PublicInbox::V2Writable->new($ibx, {nproc => 2}); + is($im->{shards}, 1, 'detected single shard from previous'); + my ($mark, $rm_mime, $smsg) = $im->remove($mime, 'test removal'); + is(content_hash($rm_mime), content_hash($mime), + 'removed object returned matches'); + ok(defined($mark), 'mark set'); $im->done; my @after = $git0->qx(@log, qw(--pretty=oneline)); my $tip = shift @after; like($tip, qr/\A[a-f0-9]+ test removal\n\z/s, 'commit message propagated to git'); is_deeply(\@after, \@before, 'only one commit written to git'); - is($ibx->mm->num_for($smsg->mid), undef, 'no longer in Msgmap by mid'); + my $mid = $smsg->{mid}; + is($ibx->mm->num_for($mid), undef, 'no longer in Msgmap by mid'); my $num = $smsg->{num}; like($num, qr/\A\d+\z/, 'numeric number in return message'); is($ibx->mm->mid_for($num), undef, 'no longer in Msgmap by num'); - my $srch = $ibx->search->reopen; - my $mset = $srch->query('m:'.$smsg->mid, { mset => 1}); + my $mset = $ibx->search->reopen->mset('m:'.$mid); is($mset->size, 0, 'no longer found in Xapian'); my @log1 = (@log, qw(-1 --pretty=raw --raw -r --no-renames)); - is($srch->{over_ro}->get_art($num), undef, + is($ibx->over->get_art($num), undef, 'removal propagated to Over DB'); my $after = $git0->qx(@log1); @@ -244,8 +255,8 @@ EOF { ok($im->add($mime), 'add message to be purged'); local $SIG{__WARN__} = sub {}; - ok(my $cmts = $im->purge($mime), 'purged message'); - like($cmts->[0], qr/\A[a-f0-9]{40}\z/, 'purge returned current commit'); + ok(my $cmt = $im->purge($mime), 'purged message'); + like($cmt->[0], qr/\A[a-f0-9]{40,}\z/, 'purge returned current commit'); $im->done; # again @@ -253,10 +264,9 @@ EOF } { - my @warn; my $x = 'x'x250; my $y = 'y'x250; - local $SIG{__WARN__} = sub { push @warn, @_ }; + local $SIG{__WARN__} = sub {}; $mime->header_set('Subject', 'long mid'); $mime->header_set('Message-ID', "<$x>"); ok($im->add($mime), 'add excessively long Message-ID'); @@ -264,14 +274,49 @@ EOF $mime->header_set('Message-ID', "<$y>"); $mime->header_set('References', "<$x>"); ok($im->add($mime), 'add excessively long References'); - $im->barrier; + $im->done; - my $msgs = $ibx->search->reopen->get_thread('x'x244); + my $msgs = $ibx->over->get_thread('x'x244); is(2, scalar(@$msgs), 'got both messages'); is($msgs->[0]->{mid}, 'x'x244, 'stored truncated mid'); is($msgs->[1]->{references}, '<'.('x'x244).'>', 'stored truncated ref'); is($msgs->[1]->{mid}, 'y'x244, 'stored truncated mid(2)'); - $im->done; +} + +my $tmp = { + inboxdir => "$inboxdir/non-existent/subdir", + name => 'nope', + version => 2, + -primary_address => 'test@example.com', +}; +eval { + my $nope = PublicInbox::V2Writable->new($tmp); + $nope->add($mime); +}; +ok($@, 'V2Writable fails on non-existent dir'); + +{ + my $v2w = PublicInbox::V2Writable->new($tmp, 1); + ok($v2w, 'creat flag works'); + $v2w->{parallel} = 0; + $v2w->init_inbox(0); + my $alt = "$tmp->{inboxdir}/all.git/objects/info/alternates"; + open my $fh, '>>', $alt or die $!; + print $fh "$inboxdir/all.git/objects\n" or die $!; + chmod(0664, $fh) or die "fchmod: $!"; + close $fh or die $!; + open $fh, '<', $alt or die $!; + my $before = do { local $/; <$fh> }; + + ok($v2w->{mg}->add_epoch(3), 'init a new epoch'); + open $fh, '<', $alt or die $!; + my $after = do { local $/; <$fh> }; + ok(index($after, $before) > 0, + 'old contents preserved after adding epoch'); + like($after, qr!\A[^\n]+?/3\.git/objects\n!s, + 'first line is newest epoch'); + my $mode = (stat($alt))[2] & 07777; + is($mode, 0664, sprintf('0%03o', $mode).' is 0664'); } done_testing();