* [PATCH 07/12] extsearch: fix remaining "eindex" references
@ 2020-11-23 7:05 6% ` Eric Wong
0 siblings, 0 replies; 3+ results
From: Eric Wong @ 2020-11-23 7:05 UTC (permalink / raw)
To: meta
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';
^ permalink raw reply related [relevance 6%]
* [PATCH 00/10] extindex: another round of updates
@ 2020-11-07 10:56 7% Eric Wong
2020-11-07 10:56 5% ` [PATCH 01/10] extsearch: rename -eindex to -extindex Eric Wong
0 siblings, 1 reply; 3+ results
From: Eric Wong @ 2020-11-07 10:56 UTC (permalink / raw)
To: meta
A major user-visible change is renaming -eindex to -extindex,
because rhyming with "reindex" is probably confusing (and I'm
easily confused :x).
PATCH 10/10 finally starts making sense performance-wise, still
testing... I've long thought the default 1m batch-size is too
small for 64-bit machines, so maybe that'll change, too.
But it took me way too long to figure out why indexBatchSize was
seemed to have no effect in my PI_CONFIG :<
My Internet access has been terribly unreliable, lately, too; so
relying on mosh/ssh access to work on more powerful machines
aint too pleasant.
Overall extindex it seems to be working somewhat OK for
incremental updates the past few weeks, but could still benefit
from speedups to work better on HW I have locally.
Will have to retest SQLite cache_size and mmap_size pragmas, too.
Eric Wong (10):
extsearch: rename -eindex to -extindex
extsearchidx: avoid needless alternates rewrite in ALL.git
searchidxshard: reduce syscalls when writing ->eidx_key
searchidxshard: further improve {current_info} readability
v2writable: less expensive checkpoint for extindex
extsearchidx: quiet warning for unindexed `d' messages
extsearch: canonicalize topdir
v2writable: more accurate {current_info} warnings/progress
extindex: SIGUSR1 supports checkpoint
extindex: fix --batch-size support
MANIFEST | 2 +-
lib/PublicInbox/Config.pm | 2 +-
lib/PublicInbox/ExtSearch.pm | 2 +
lib/PublicInbox/ExtSearchIdx.pm | 37 +++++++++++++------
lib/PublicInbox/SearchIdxShard.pm | 9 ++---
lib/PublicInbox/V2Writable.pm | 37 ++++++++++++++-----
...lic-inbox-eindex => public-inbox-extindex} | 8 +++-
t/extsearch.t | 6 +--
8 files changed, 68 insertions(+), 35 deletions(-)
rename script/{public-inbox-eindex => public-inbox-extindex} (84%)
^ permalink raw reply [relevance 7%]
* [PATCH 01/10] extsearch: rename -eindex to -extindex
2020-11-07 10:56 7% [PATCH 00/10] extindex: another round of updates Eric Wong
@ 2020-11-07 10:56 5% ` Eric Wong
0 siblings, 0 replies; 3+ results
From: Eric Wong @ 2020-11-07 10:56 UTC (permalink / raw)
To: meta
Upon "eindex" rhymes with "reindex", which could be confusing;
so name the command and config prefix to use "extindex" which
is hopefully less confusing.
---
MANIFEST | 2 +-
lib/PublicInbox/Config.pm | 2 +-
script/{public-inbox-eindex => public-inbox-extindex} | 4 ++--
t/extsearch.t | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
rename script/{public-inbox-eindex => public-inbox-extindex} (93%)
diff --git a/MANIFEST b/MANIFEST
index 10561cd2..fc79a134 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -225,7 +225,7 @@ sa_config/user/.spamassassin/user_prefs
script/public-inbox-compact
script/public-inbox-convert
script/public-inbox-edit
-script/public-inbox-eindex
+script/public-inbox-extindex
script/public-inbox-httpd
script/public-inbox-imapd
script/public-inbox-index
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index d425cc9b..d2010f7a 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -91,7 +91,7 @@ sub lookup_name ($$) {
sub lookup_ei {
my ($self, $name) = @_;
- $self->{-ei_by_name}->{$name} //= _fill_ei($self, "eindex.$name");
+ $self->{-ei_by_name}->{$name} //= _fill_ei($self, "extindex.$name");
}
sub each_inbox {
diff --git a/script/public-inbox-eindex b/script/public-inbox-extindex
similarity index 93%
rename from script/public-inbox-eindex
rename to script/public-inbox-extindex
index c26edb93..a58f35ca 100644
--- a/script/public-inbox-eindex
+++ b/script/public-inbox-extindex
@@ -6,7 +6,7 @@ use strict;
use v5.10.1;
use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
my $help = <<EOF; # the following should fit w/o scrolling in 80x24 term:
-usage: public-inbox-eindex [options] EINDEX_DIR [INBOX_DIR]
+usage: public-inbox-extindex [options] EXTINDEX_DIR [INBOX_DIR]
Create and update external (detached) search indices
@@ -19,7 +19,7 @@ usage: public-inbox-eindex [options] EINDEX_DIR [INBOX_DIR]
--verbose | -v increase verbosity (may be repeated)
BYTES may use `k', `m', and `g' suffixes (e.g. `10m' for 10 megabytes)
-See public-inbox-eindex(1) man page for full documentation.
+See public-inbox-extindex(1) man page for full documentation.
EOF
my $opt = { quiet => -1, compact => 0, max_size => undef, fsync => 1 };
GetOptions($opt, qw(verbose|v+ reindex rethread compact|c+ jobs|j=i
diff --git a/t/extsearch.t b/t/extsearch.t
index 8d2c1507..8792fd9e 100644
--- a/t/extsearch.t
+++ b/t/extsearch.t
@@ -33,7 +33,7 @@ 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(-eindex --all), "$home/eindex"]), 'eindex init');
+ok(run_script([qw(-extindex --all), "$home/eindex"]), 'extindex init');
my $es = PublicInbox::ExtSearch->new("$home/eindex");
{
@@ -53,8 +53,8 @@ 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(-eindex --all), "$home/eindex"], undef, $opt),
- 'eindex again');
+ ok(run_script([qw(-extindex --all), "$home/eindex"], 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';
my $msg2 = $es->over->get_art(2) or BAIL_OUT 'msg2 missing';
^ permalink raw reply related [relevance 5%]
Results 1-3 of 3 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-11-07 10:56 7% [PATCH 00/10] extindex: another round of updates Eric Wong
2020-11-07 10:56 5% ` [PATCH 01/10] extsearch: rename -eindex to -extindex Eric Wong
2020-11-23 7:05 [PATCH 00/12] extindex: speed up manifest.js.gz generation Eric Wong
2020-11-23 7:05 6% ` [PATCH 07/12] extsearch: fix remaining "eindex" references Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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).