-# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict;
use warnings;
body => "hello world\n",
);
-my $im = eval {
- local $ENV{NPROC} = '1';
- PublicInbox::V2Writable->new($ibx, 1);
-};
-is($im->{partitions}, 1, 'one partition when forced');
+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*/*"),
$mime->header_set('References', '<zz-mid@b>');
ok($im->add($mime), 'message with multiple Message-ID');
$im->done;
+ my ($total, undef) = $ibx->over->recent;
+ is($ibx->mm->num_highwater, $total, 'got expected highwater value');
my $srch = $ibx->search;
my $mset1 = $srch->reopen->query('m:abcde@1', { mset => 1 });
is($mset1->size, 1, 'message found by first MID');
'same document') if ($mset1->size);
}
-SKIP: {
+{
use Net::NNTP;
- use IO::Socket;
- use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
- eval { require PublicInbox::DS };
- skip "PublicInbox::DS 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 $group = 'inbox.comp.test.v2writable';
my $pi_config = "$mainrepo/pi_config";
open my $fh, '>', $pi_config or die "open: $!\n";
EOF
;
close $fh or die "close: $!\n";
- my $sock = IO::Socket::INET->new(%opts);
+ my $sock = tcp_server();
ok($sock, 'sock created');
my $pid;
my $len;
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');
+ $im = PublicInbox::V2Writable->new($ibx, {nproc => 2});
+ is($im->{shards}, 1, 'detected single shard from previous');
my $smsg = $im->remove($mime, 'test removal');
$im->done;
my @after = $git0->qx(@log, qw(--pretty=oneline));
}
{
- 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');
ok($im->add($mime), 'add excessively long References');
$im->barrier;
- my $msgs = $ibx->search->reopen->get_thread('x'x244);
+ my $msgs = $ibx->search->{over_ro}->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');