diff options
author | Eric Wong <e@80x24.org> | 2021-03-15 12:58:24 +0100 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-03-15 16:54:30 -0400 |
commit | 22fb64d47e74f2a26ca2dbb3a76f08c9912d5375 (patch) | |
tree | 4b4474c8b45fb32b0ec483042453b196fbfbd485 | |
parent | 210d283ed36eff9bb81ec1e644a02dd4f0d39e31 (diff) | |
download | public-inbox-22fb64d47e74f2a26ca2dbb3a76f08c9912d5375.tar.gz |
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.
-rw-r--r-- | t/thread-index-gap.t | 24 |
1 files 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+ <https://www.gnu.org/licenses/agpl-3.0.txt> 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)"); } |