From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 10/14] searchidx: use singular `$opt' for consistency with v2
Date: Mon, 10 Aug 2020 02:12:01 +0000 [thread overview]
Message-ID: <20200810021205.18909-11-e@yhbt.net> (raw)
In-Reply-To: <20200810021205.18909-1-e@yhbt.net>
The rest of our indexing code uses `$opt' instead of `$opts'.
---
lib/PublicInbox/SearchIdx.pm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 7f2447fe..5c39f3d6 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -539,11 +539,11 @@ sub unindex_both { # git->cat_async callback
# called by public-inbox-index
sub index_sync {
- my ($self, $opts) = @_;
- delete $self->{lock_path} if $opts->{-skip_lock};
- $self->{ibx}->with_umask(\&_index_sync, $self, $opts);
- if ($opts->{reindex}) {
- my %again = %$opts;
+ my ($self, $opt) = @_;
+ delete $self->{lock_path} if $opt->{-skip_lock};
+ $self->{ibx}->with_umask(\&_index_sync, $self, $opt);
+ if ($opt->{reindex}) {
+ my %again = %$opt;
delete @again{qw(rethread reindex)};
index_sync($self, \%again);
}
@@ -745,15 +745,15 @@ sub reindex_from ($$) {
# indexes all unindexed messages (v1 only)
sub _index_sync {
- my ($self, $opts) = @_;
- my $tip = $opts->{ref} || 'HEAD';
+ my ($self, $opt) = @_;
+ my $tip = $opt->{ref} || 'HEAD';
my $git = $self->{ibx}->git;
- $self->{batch_bytes} = $opts->{batch_size} // $BATCH_BYTES;
+ $self->{batch_bytes} = $opt->{batch_size} // $BATCH_BYTES;
$git->batch_prepare;
- my $pr = $opts->{-progress};
- my $sync = { reindex => $opts->{reindex}, -opt => $opts };
+ my $pr = $opt->{-progress};
+ my $sync = { reindex => $opt->{reindex}, -opt => $opt };
my $xdb = $self->begin_txn_lazy;
- $self->{over}->rethread_prepare($opts);
+ $self->{over}->rethread_prepare($opt);
my $mm = _msgmap_init($self);
if ($sync->{reindex}) {
my $last = $mm->last_commit;
next prev parent reply other threads:[~2020-08-10 2:12 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-10 2:11 [PATCH 00/14] more indexing related improvements Eric Wong
2020-08-10 2:11 ` [PATCH 01/14] index: require --reindex when using --xapian-only Eric Wong
2020-08-10 2:11 ` [PATCH 02/14] index: --sequential-shard works incrementally Eric Wong
2020-08-10 2:11 ` [PATCH 03/14] doc: index: more notes about latest changes Eric Wong
2020-08-10 2:38 ` Kyle Meyer
2020-08-10 6:29 ` Eric Wong
2020-08-10 2:11 ` [PATCH 04/14] doc: add some notes around -xcpdb / -edit / -purge Eric Wong
2020-08-10 2:11 ` [PATCH 05/14] index+xcpdb: improve SIG{INT,TERM,HUP,PIPE} behavior Eric Wong
2020-08-10 2:11 ` [PATCH 06/14] msgmap: tmp_clone: simplify + meaningful filename Eric Wong
2020-08-10 2:11 ` [PATCH 07/14] avoid File::Temp::tempfile in more places Eric Wong
2020-08-10 2:11 ` [PATCH 08/14] admin: use a generic veriable name Eric Wong
2020-08-10 2:38 ` Kyle Meyer
2020-08-10 2:12 ` [PATCH 09/14] index: cleanup internal variables Eric Wong
2020-08-10 2:12 ` Eric Wong [this message]
2020-08-10 2:12 ` [PATCH 11/14] convert: support new -index options Eric Wong
2020-08-10 2:12 ` [PATCH 12/14] convert: speed up --help Eric Wong
2020-08-10 2:12 ` [PATCH 13/14] convert: check ARGV more correctly Eric Wong
2020-08-10 2:12 ` [PATCH 14/14] convert: set No_COW on copied SQLite files 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=20200810021205.18909-11-e@yhbt.net \
--to=e@yhbt.net \
--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.
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).