From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 01/10] v2writable: introduce $sync state and put mm_tmp in it
Date: Wed, 29 May 2019 08:28:51 +0000 [thread overview]
Message-ID: <20190529082900.9312-2-e@80x24.org> (raw)
In-Reply-To: <20190529082900.9312-1-e@80x24.org>
A first step towards making the v2 index_sync code
easier-to-follow. More fields to follow...
---
lib/PublicInbox/V2Writable.pm | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 331c4f4..584767a 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -706,7 +706,7 @@ sub mark_deleted {
}
sub reindex_oid {
- my ($self, $mm_tmp, $D, $git, $oid, $regen, $reindex) = @_;
+ my ($self, $sync, $D, $git, $oid, $regen, $reindex) = @_;
my $len;
my $msgref = $git->cat_file($oid, \$len);
my $mime = PublicInbox::MIME->new($$msgref);
@@ -714,13 +714,13 @@ sub reindex_oid {
my $cid = content_id($mime);
# get the NNTP article number we used before, highest number wins
- # and gets deleted from mm_tmp;
+ # and gets deleted from sync->{mm_tmp};
my $mid0;
my $num = -1;
my $del = 0;
foreach my $mid (@$mids) {
$del += delete($D->{"$mid\0$cid"}) ? 1 : 0;
- my $n = $mm_tmp->num_for($mid);
+ my $n = $sync->{mm_tmp}->num_for($mid);
if (defined $n && $n > $num) {
$mid0 = $mid;
$num = $n;
@@ -764,7 +764,7 @@ sub reindex_oid {
return;
}
- $mm_tmp->mid_delete($mid0) or
+ $sync->{mm_tmp}->mid_delete($mid0) or
die "failed to delete <$mid0> for article #$num\n";
$self->{over}->add_overview($mime, $len, $num, $oid, $mid0);
@@ -775,14 +775,14 @@ sub reindex_oid {
my $n = $self->{transact_bytes} += $len;
if ($n > (PublicInbox::SearchIdx::BATCH_BYTES * $nparts)) {
$git->cleanup;
- $mm_tmp->atfork_prepare;
+ $sync->{mm_tmp}->atfork_prepare;
$self->done; # release lock
# TODO: print progress info, here
# allow -watch or -mda to write...
$self->idx_init; # reacquire lock
- $mm_tmp->atfork_parent;
+ $sync->{mm_tmp}->atfork_parent;
}
}
@@ -961,7 +961,9 @@ sub index_sync {
my $latest = git_dir_latest($self, \$epoch_max);
return unless defined $latest;
$self->idx_init($opts); # acquire lock
- my $mm_tmp = $self->{mm}->tmp_clone;
+ my $sync = {
+ mm_tmp => $self->{mm}->tmp_clone,
+ };
my $reindex = $opts->{reindex};
my $ranges = index_ranges($self, $reindex, $epoch_max);
@@ -997,7 +999,7 @@ sub index_sync {
if (/\A$x40$/o && !defined($cmt)) {
$cmt = $_;
} elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\tm$/o) {
- $self->reindex_oid($mm_tmp, $D, $git, $1,
+ $self->reindex_oid($sync, $D, $git, $1,
$regen, $reindex);
} elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\td$/o) {
$self->mark_deleted($D, $git, $1);
@@ -1020,7 +1022,7 @@ sub index_sync {
# reindex does not pick up new changes, so we rerun w/o it:
if ($opts->{reindex}) {
my %again = %$opts;
- $mm_tmp = undef;
+ $sync = undef;
delete @again{qw(reindex -skip_lock)};
index_sync($self, \%again);
}
--
EW
next prev parent reply other threads:[~2019-05-29 8:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-29 8:28 [PATCH 00/10] index: support progress output Eric Wong
2019-05-29 8:28 ` Eric Wong [this message]
2019-05-29 8:28 ` [PATCH 02/10] v2writable: sync: move delete markers into $sync state Eric Wong
2019-05-29 8:28 ` [PATCH 03/10] v2writable: move {reindex} field to " Eric Wong
2019-05-29 8:28 ` [PATCH 04/10] v2writable: move {regen} into " Eric Wong
2019-05-29 8:28 ` [PATCH 05/10] v2writable: move {ranges} " Eric Wong
2019-05-29 8:28 ` [PATCH 06/10] v2writable: localize unindex-range.$EPOCH to " Eric Wong
2019-05-29 8:28 ` [PATCH 07/10] v2writable: use prototypes for internal subs Eric Wong
2019-05-29 8:28 ` [PATCH 08/10] v2writable: move index_sync options to sync state Eric Wong
2019-05-29 8:28 ` [PATCH 09/10] index: support --verbose option Eric Wong
2019-05-29 8:29 ` [PATCH 10/10] v2writable: show progress updates for index_sync 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: http://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=20190529082900.9312-2-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.
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).