From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 32AFB1FB0F for ; Mon, 15 Mar 2021 11:58:28 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 06/35] t/xcpdb-reshard: use create_inbox Date: Mon, 15 Mar 2021 12:57:57 +0100 Message-Id: <20210315115826.17591-7-e@80x24.org> In-Reply-To: <20210315115826.17591-1-e@80x24.org> References: <20210315115826.17591-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Over 100ms saved and fewer LoC to boot --- t/xcpdb-reshard.t | 54 ++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 31 deletions(-) diff --git a/t/xcpdb-reshard.t b/t/xcpdb-reshard.t index 1b726f1a..8516b907 100644 --- a/t/xcpdb-reshard.t +++ b/t/xcpdb-reshard.t @@ -1,52 +1,50 @@ +#!perl -w # Copyright (C) 2019-2021 all contributors # License: AGPL-3.0+ use strict; -use warnings; -use Test::More; +use v5.10.1; use PublicInbox::TestCommon; require_mods(qw(DBD::SQLite Search::Xapian)); require_git('2.6'); use PublicInbox::Eml; -use PublicInbox::InboxWritable; require PublicInbox::Search; -my $mime = PublicInbox::Eml->new(<<'EOF'); +my ($tmpdir, $for_destroy) = tmpdir(); +my $nproc = 8; +my $ndoc = 13; +my $ibx = create_inbox 'test', version => 2, indexlevel => 'medium', + tmpdir => "$tmpdir/testbox", nproc => $nproc, sub { + my ($im, $ibx) = @_; + my $eml = PublicInbox::Eml->new(<<'EOF'); From: a@example.com To: test@example.com Subject: this is a subject Date: Fri, 02 Oct 1993 00:00:00 +0000 EOF -my ($this) = (split('/', $0))[-1]; -my ($tmpdir, $for_destroy) = tmpdir(); -local $ENV{PI_CONFIG} = "$tmpdir/config"; -my $ibx = PublicInbox::Inbox->new({ - inboxdir => "$tmpdir/testbox", - name => $this, - version => 2, - -primary_address => 'test@example.com', - indexlevel => 'medium', -}); -my @xcpdb = qw(-xcpdb -q); -my $nproc = 8; -my $ndoc = 13; -my $im = PublicInbox::InboxWritable->new($ibx, {nproc => $nproc})->importer; -for my $i (1..$ndoc) { - $mime->header_set('Message-ID', ""); - ok($im->add($mime), "message $i added"); -} -$im->done; + for my $i (1..$ndoc) { + $eml->header_set('Message-ID', ""); + ok($im->add($eml), "message $i added"); + } + open my $fh, '>', "$ibx->{inboxdir}/empty" or BAIL_OUT "open $!"; +}; +my $env = { PI_CONFIG => "$ibx->{inboxdir}/empty" }; my @shards = grep(m!/\d+\z!, glob("$ibx->{inboxdir}/xap*/*")); is(scalar(@shards), $nproc - 1, 'got expected shards'); my $orig = $ibx->over->query_xover(1, $ndoc); my %nums = map {; "$_->{num}" => 1 } @$orig; +my @xcpdb = qw(-xcpdb -q); +my $XapianDatabase = do { + no warnings 'once'; + $PublicInbox::Search::X{Database}; +}; # ensure we can go up or down in shards, or stay the same: for my $R (qw(2 4 1 3 3)) { delete $ibx->{search}; # release old handles my $cmd = [@xcpdb, "-R$R", $ibx->{inboxdir}]; push @$cmd, '--compact' if $R == 1 && have_xapian_compact; - ok(run_script($cmd), "xcpdb -R$R"); + ok(run_script($cmd, $env), "xcpdb -R$R"); my @new_shards = grep(m!/\d+\z!, glob("$ibx->{inboxdir}/xap*/*")); is(scalar(@new_shards), $R, 'resharded to two shards'); my $mset = $ibx->search->mset('s:this'); @@ -60,10 +58,6 @@ for my $R (qw(2 4 1 3 3)) { # ensure docids in Xapian match NNTP article numbers my $tot = 0; my %tmp = %nums; - my $XapianDatabase = do { - no warnings 'once'; - $PublicInbox::Search::X{Database}; - }; foreach my $d (@new_shards) { my $xdb = $XapianDatabase->new($d); $tot += $xdb->get_doccount; @@ -78,6 +72,4 @@ for my $R (qw(2 4 1 3 3)) { } is(scalar keys %tmp, 0, 'all docids seen'); } - -done_testing(); -1; +done_testing;