From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 07/12] extsearch: fix remaining "eindex" references
Date: Mon, 23 Nov 2020 07:05:57 +0000 [thread overview]
Message-ID: <20201123070602.9698-8-e@80x24.org> (raw)
In-Reply-To: <20201123070602.9698-1-e@80x24.org>
We'll replace "$EINDEX" => "$EXTINDEX" in a user-visible
line and also some hacker-only tests.
"eindex" is no longer used because it rhymes with "reindex",
so remove the last instance of it.
Fixes: 6b0fed3b03263ba2 ("extsearch: rename -eindex to -extindex")
---
lib/PublicInbox/ExtSearch.pm | 2 +-
t/extsearch.t | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/ExtSearch.pm b/lib/PublicInbox/ExtSearch.pm
index c41ae443..dd93cd32 100644
--- a/lib/PublicInbox/ExtSearch.pm
+++ b/lib/PublicInbox/ExtSearch.pm
@@ -57,7 +57,7 @@ sub description {
my ($self) = @_;
($self->{description} //=
PublicInbox::Inbox::cat_desc("$self->{topdir}/description")) //
- '$EINDEX_DIR/description missing';
+ '$EXTINDEX_DIR/description missing';
}
sub cloneurl { [] } # TODO
diff --git a/t/extsearch.t b/t/extsearch.t
index dc825bf4..0045294b 100644
--- a/t/extsearch.t
+++ b/t/extsearch.t
@@ -35,9 +35,9 @@ seek($fh, 0, SEEK_SET) or BAIL_OUT $!;
run_script(['-mda', '--no-precheck'], $env, { 0 => $fh }) or BAIL_OUT '-mda';
run_script(['-index', "$home/v1test"]) or BAIL_OUT "index $?";
-ok(run_script([qw(-extindex --all), "$home/eindex"]), 'extindex init');
+ok(run_script([qw(-extindex --all), "$home/extindex"]), 'extindex init');
-my $es = PublicInbox::ExtSearch->new("$home/eindex");
+my $es = PublicInbox::ExtSearch->new("$home/extindex");
{
my $smsg = $es->over->get_art(1);
ok($smsg, 'got first article');
@@ -55,7 +55,7 @@ my $es = PublicInbox::ExtSearch->new("$home/eindex");
my $env = { MAIL_EDITOR => "$^X -i -p -e 's/test message/BEST MSG/'" };
my $cmd = [ qw(-edit -Ft/utf8.eml), "$home/v2test" ];
ok(run_script($cmd, $env, $opt), '-edit');
- ok(run_script([qw(-extindex --all), "$home/eindex"], undef, $opt),
+ ok(run_script([qw(-extindex --all), "$home/extindex"], undef, $opt),
'extindex again');
like($err, qr/discontiguous range/, 'warned about discontiguous range');
my $msg1 = $es->over->get_art(1) or BAIL_OUT 'msg1 missing';
next prev parent reply other threads:[~2020-11-23 7:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 7:05 [PATCH 00/12] extindex: speed up manifest.js.gz generation Eric Wong
2020-11-23 7:05 ` [PATCH 01/12] miscsearch: a new Xapian sub-DB for extindex Eric Wong
2020-11-23 7:05 ` [PATCH 02/12] move JSON module portability into PublicInbox::Config Eric Wong
2020-11-23 7:05 ` [PATCH 03/12] git: add manifest_entry method Eric Wong
2020-11-23 7:05 ` [PATCH 04/12] manifest: use ibx->git_epoch method for v2 Eric Wong
2020-11-23 7:05 ` [PATCH 05/12] inbox: git_epoch: remove ->version check Eric Wong
2020-11-23 7:05 ` [PATCH 06/12] miscidx: put grokmirror manifest entries in Xapian docdata Eric Wong
2020-11-23 7:05 ` Eric Wong [this message]
2020-11-23 7:05 ` [PATCH 08/12] miscidx: cleanup git processes after manifest indexing Eric Wong
2020-11-23 7:05 ` [PATCH 09/12] miscidx: store absolute git_dir of each epoch in docdata Eric Wong
2020-11-23 7:06 ` [PATCH 10/12] extsearchidx: do not short-circuit MiscIdx on no-op v2 prepare Eric Wong
2020-11-23 7:06 ` [PATCH 11/12] manifest: support faster generation via [extindex "all"] Eric Wong
2020-11-23 7:06 ` [PATCH 12/12] *search: simplify retry_reopen users 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=20201123070602.9698-8-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).