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 AACD41FD82 for ; Mon, 15 Mar 2021 11:58:33 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 33/35] t/thread-index-gap: create_inbox Date: Mon, 15 Mar 2021 12:58:24 +0100 Message-Id: <20210315115826.17591-34-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: Yes, this loses some randomness w.r.t. shuffle, but I think it's "good enough" and buys us ~100ms speedup on an SSD TMPDIR. --- t/thread-index-gap.t | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/t/thread-index-gap.t b/t/thread-index-gap.t index 125c5cbd..d3cb6204 100644 --- a/t/thread-index-gap.t +++ b/t/thread-index-gap.t @@ -3,10 +3,8 @@ # License: AGPL-3.0+ use strict; use v5.10.1; -use Test::More; use PublicInbox::TestCommon; use PublicInbox::Eml; -use PublicInbox::InboxWritable; use PublicInbox::Config; use List::Util qw(shuffle); require_mods(qw(DBD::SQLite)); @@ -31,26 +29,26 @@ References: <20201202045540.31248-1-j@example.com> EOF my ($home, $for_destroy) = tmpdir(); -local $ENV{HOME} = $home; for my $msgs (['orig', reverse @msgs], ['shuffle', shuffle(@msgs)]) { my $desc = shift @$msgs; my $n = "index-cap-$desc"; - run_script([qw(-init -L basic -V2), $n, "$home/$n", - "http://example.com/$n", "$n\@example.com"]) or - BAIL_OUT 'init'; - my $ibx = PublicInbox::Config->new->lookup_name($n); - my $im = PublicInbox::InboxWritable->new($ibx)->importer(0); - for my $m (@$msgs) { - $im->add(PublicInbox::Eml->new("$m\nFrom: x\@example.com\n\n")); - } - $im->done; + # yes, the shuffle case gets memoized by create_inbox, oh well + my $ibx = create_inbox $desc, version => 2, indexlevel => 'full', + tmpdir => "$home/$desc", sub { + my ($im) = @_; + for my $m (@$msgs) { + my $x = "$m\nFrom: x\@example.com\n\n"; + $im->add(PublicInbox::Eml->new(\$x)); + } + }; my $over = $ibx->over; my $dbh = $over->dbh; my $tid = $dbh->selectall_arrayref('SELECT DISTINCT(tid) FROM over'); is(scalar(@$tid), 1, "only one thread initially ($desc)"); $over->dbh_close; + my $env = { HOME => $home }; run_script([qw(-index --no-fsync --reindex --rethread), - $ibx->{inboxdir}]) or BAIL_OUT 'rethread'; + $ibx->{inboxdir}], $env) or BAIL_OUT 'rethread'; $tid = $dbh->selectall_arrayref('SELECT DISTINCT(tid) FROM over'); is(scalar(@$tid), 1, "only one thread after rethread ($desc)"); }