From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 02/10] v2writable: sync: move delete markers into $sync state
Date: Wed, 29 May 2019 08:28:52 +0000 [thread overview]
Message-ID: <20190529082900.9312-3-e@80x24.org> (raw)
In-Reply-To: <20190529082900.9312-1-e@80x24.org>
Another small step to reduce parameters passed to reindex_oid.
---
lib/PublicInbox/V2Writable.pm | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 584767a..efb9f42 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -695,18 +695,18 @@ sub atfork_child {
}
sub mark_deleted {
- my ($self, $D, $git, $oid) = @_;
+ my ($self, $sync, $git, $oid) = @_;
my $msgref = $git->cat_file($oid);
my $mime = PublicInbox::MIME->new($$msgref);
my $mids = mids($mime->header_obj);
my $cid = content_id($mime);
foreach my $mid (@$mids) {
- $D->{"$mid\0$cid"} = $oid;
+ $sync->{D}->{"$mid\0$cid"} = $oid;
}
}
sub reindex_oid {
- my ($self, $sync, $D, $git, $oid, $regen, $reindex) = @_;
+ my ($self, $sync, $git, $oid, $regen, $reindex) = @_;
my $len;
my $msgref = $git->cat_file($oid, \$len);
my $mime = PublicInbox::MIME->new($$msgref);
@@ -719,7 +719,7 @@ sub reindex_oid {
my $num = -1;
my $del = 0;
foreach my $mid (@$mids) {
- $del += delete($D->{"$mid\0$cid"}) ? 1 : 0;
+ $del += delete($sync->{D}->{"$mid\0$cid"}) ? 1 : 0;
my $n = $sync->{mm_tmp}->num_for($mid);
if (defined $n && $n > $num) {
$mid0 = $mid;
@@ -963,6 +963,7 @@ sub index_sync {
$self->idx_init($opts); # acquire lock
my $sync = {
mm_tmp => $self->{mm}->tmp_clone,
+ D => {}, # "$mid\0$cid" => $oid
};
my $reindex = $opts->{reindex};
my $ranges = index_ranges($self, $reindex, $epoch_max);
@@ -977,7 +978,6 @@ sub index_sync {
$$regen += $high;
}
- my $D = {}; # "$mid\0$cid" => $oid
my @cmd = qw(log --raw -r --pretty=tformat:%H
--no-notes --no-color --no-abbrev --no-renames);
@@ -999,10 +999,10 @@ sub index_sync {
if (/\A$x40$/o && !defined($cmt)) {
$cmt = $_;
} elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\tm$/o) {
- $self->reindex_oid($sync, $D, $git, $1,
+ $self->reindex_oid($sync, $git, $1,
$regen, $reindex);
} elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\td$/o) {
- $self->mark_deleted($D, $git, $1);
+ $self->mark_deleted($sync, $git, $1);
}
}
$fh = undef;
@@ -1012,9 +1012,9 @@ sub index_sync {
# unindex is required for leftovers if "deletes" affect messages
# in a previous fetch+index window:
- if (scalar keys %$D) {
+ if (my @leftovers = values %{delete $sync->{D}}) {
my $git = $self->{-inbox}->git;
- $self->unindex_oid($git, $_) for values %$D;
+ $self->unindex_oid($git, $_) for @leftovers;
$git->cleanup;
}
$self->done;
--
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 ` [PATCH 01/10] v2writable: introduce $sync state and put mm_tmp in it Eric Wong
2019-05-29 8:28 ` Eric Wong [this message]
2019-05-29 8:28 ` [PATCH 03/10] v2writable: move {reindex} field to $sync state 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-3-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).