From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 33/35] t/thread-index-gap: create_inbox
Date: Mon, 15 Mar 2021 12:58:24 +0100 [thread overview]
Message-ID: <20210315115826.17591-34-e@80x24.org> (raw)
In-Reply-To: <20210315115826.17591-1-e@80x24.org>
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+ <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)");
}
next prev parent reply other threads:[~2021-03-15 11:58 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 11:57 [PATCH 00/35] memoize inbox creations Eric Wong
2021-03-15 11:57 ` [PATCH 01/35] test_common: add create_inbox helper sub Eric Wong
2021-03-15 11:57 ` [PATCH 02/35] t/lei_xsearch: use create_inbox Eric Wong
2021-03-15 11:57 ` [PATCH 03/35] test_common: minor simplifications to setup_public_inboxes Eric Wong
2021-03-15 11:57 ` [PATCH 04/35] t/imapd-tls: switch to create_inbox Eric Wong
2021-03-15 11:57 ` [PATCH 05/35] t/www_altid: use create_inbox Eric Wong
2021-03-15 11:57 ` [PATCH 06/35] t/xcpdb-reshard: " Eric Wong
2021-03-15 11:57 ` [PATCH 07/35] t/v2dupindex: create_inbox Eric Wong
2021-03-15 11:57 ` [PATCH 08/35] t/admin: switch to create_inbox Eric Wong
2021-03-15 19:51 ` [SQUASH] " Eric Wong
2021-03-15 11:58 ` [PATCH 09/35] t/html_index: remove now-worthless test Eric Wong
2021-03-15 11:58 ` [PATCH 10/35] t/plack: use create_inbox Eric Wong
2021-03-15 11:58 ` [PATCH 11/35] t/psgi_attach: convert to create_inbox Eric Wong
2021-03-15 11:58 ` [PATCH 12/35] t/httpd: " Eric Wong
2021-03-15 11:58 ` [PATCH 13/35] t/convert-compact: create_inbox Eric Wong
2021-03-15 11:58 ` [PATCH 14/35] t/altid: use create_inbox Eric Wong
2021-03-15 11:58 ` [PATCH 15/35] t/psgi_mount: switch to create_inbox Eric Wong
2021-03-15 11:58 ` [PATCH 16/35] t/feed: " Eric Wong
2021-03-15 11:58 ` [PATCH 17/35] t/psgi_bad_mids: use create_inbox Eric Wong
2021-03-15 11:58 ` [PATCH 18/35] t/psgi_multipart_not: " Eric Wong
2021-03-15 11:58 ` [PATCH 19/35] t/psgi_scan_all: create_inbox lots saved Eric Wong
2021-03-15 11:58 ` [PATCH 20/35] t/psgi_v2: create_inbox Eric Wong
2021-03-15 11:58 ` [PATCH 21/35] t/imapd: create_inbox (minor) Eric Wong
2021-03-15 11:58 ` [PATCH 22/35] t/solver_git: use create_inbox Eric Wong
2021-03-15 11:58 ` [PATCH 23/35] t/cgi: create_inbox Eric Wong
2021-03-15 11:58 ` [PATCH 24/35] t/edit: switch to create_inbox Eric Wong
2021-03-15 11:58 ` [PATCH 25/35] t/inbox_idle: " Eric Wong
2021-03-15 11:58 ` [PATCH 26/35] t/lei_xsearch: use create_inbox Eric Wong
2021-03-15 11:58 ` [PATCH 27/35] t/indexlevels-mirror: " Eric Wong
2021-03-15 11:58 ` [PATCH 28/35] t/multi-mid: " Eric Wong
2021-03-15 11:58 ` [PATCH 29/35] t/psgi_search: " Eric Wong
2021-03-15 11:58 ` [PATCH 30/35] t/miscsearch: " Eric Wong
2021-03-15 11:58 ` [PATCH 31/35] t/nntpd-tls: " Eric Wong
2021-03-15 11:58 ` [PATCH 32/35] t/nntpd: " Eric Wong
2021-03-15 11:58 ` Eric Wong [this message]
2021-03-15 11:58 ` [PATCH 34/35] t/altid_v2: create_inbox Eric Wong
2021-03-15 11:58 ` [PATCH 35/35] t/*: disable fsync on tests were create_inbox isn't worth it Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210315115826.17591-34-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).