* [PATCH 0/4] v2writable: speedup no-op -index invocation
@ 2019-05-30 6:52 7% Eric Wong
2019-05-30 6:52 6% ` [PATCH 2/4] v2writable: hoist out index_epoch sub Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-05-30 6:52 UTC (permalink / raw)
To: meta
`public-inbox-index' was doing unnecessary work in no-op
situations (after "git fetch") and takes several seconds
on v2 repos.
On my dinky laptop, this allows a no-op -index on
lore.kernel.org/lkml to go from ~8s to ~0.4s
Eric Wong (4):
v2writable: split off unindex_range mapping
v2writable: hoist out index_epoch sub
v2writable: avoid mm_tmp creation without regen
v2writable: short-circuit is_ancestor check on equality
lib/PublicInbox/V2Writable.pm | 92 +++++++++++++++++++++++------------
1 file changed, 61 insertions(+), 31 deletions(-)
--
EW
^ permalink raw reply [relevance 7%]
* [PATCH 2/4] v2writable: hoist out index_epoch sub
2019-05-30 6:52 7% [PATCH 0/4] v2writable: speedup no-op -index invocation Eric Wong
@ 2019-05-30 6:52 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-05-30 6:52 UTC (permalink / raw)
To: meta
This will make future changes easier-to-follow.
---
lib/PublicInbox/V2Writable.pm | 65 ++++++++++++++++++++---------------
1 file changed, 37 insertions(+), 28 deletions(-)
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index df8cfb4..375f12f 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -981,6 +981,42 @@ sub sync_ranges ($$$) {
$ranges;
}
+sub index_epoch ($$$) {
+ my ($self, $sync, $i) = @_;
+
+ my $git_dir = git_dir_n($self, $i);
+ die 'BUG: already reindexing!' if $self->{reindex_pipe};
+ -d $git_dir or return; # missing parts are fine
+ fill_alternates($self, $i);
+ my $git = PublicInbox::Git->new($git_dir);
+ if (my $unindex_range = delete $sync->{unindex_range}->{$i}) {
+ unindex($self, $sync, $git, $unindex_range);
+ }
+ defined(my $range = $sync->{ranges}->[$i]) or return;
+ if (my $pr = $sync->{-opt}->{-progress}) {
+ $pr->("$i.git indexing $range\n");
+ }
+
+ my @cmd = qw(log --raw -r --pretty=tformat:%H
+ --no-notes --no-color --no-abbrev --no-renames);
+ my $fh = $self->{reindex_pipe} = $git->popen(@cmd, $range);
+ my $cmt;
+ while (<$fh>) {
+ chomp;
+ $self->{current_info} = "$i.git $_";
+ if (/\A$x40$/o && !defined($cmt)) {
+ $cmt = $_;
+ } elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\tm$/o) {
+ reindex_oid($self, $sync, $git, $1);
+ } elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\td$/o) {
+ mark_deleted($self, $sync, $git, $1);
+ }
+ }
+ $fh = undef;
+ delete $self->{reindex_pipe};
+ update_last_commit($self, $git, $i, $cmt) if defined $cmt;
+}
+
# public, called by public-inbox-index
sub index_sync {
my ($self, $opt) = @_;
@@ -1000,36 +1036,9 @@ sub index_sync {
$sync->{ranges} = sync_ranges($self, $sync, $epoch_max);
$sync->{regen} = sync_prepare($self, $sync, $epoch_max);
- my @cmd = qw(log --raw -r --pretty=tformat:%H
- --no-notes --no-color --no-abbrev --no-renames);
-
# work backwards through history
for (my $i = $epoch_max; $i >= 0; $i--) {
- my $git_dir = git_dir_n($self, $i);
- die 'BUG: already reindexing!' if $self->{reindex_pipe};
- -d $git_dir or next; # missing parts are fine
- fill_alternates($self, $i);
- my $git = PublicInbox::Git->new($git_dir);
- my $unindex_range = delete $sync->{unindex_range}->{$i};
- unindex($self, $sync, $git, $unindex_range) if $unindex_range;
- defined(my $range = $sync->{ranges}->[$i]) or next;
- $pr->("$i.git indexing $range\n") if $pr;
- my $fh = $self->{reindex_pipe} = $git->popen(@cmd, $range);
- my $cmt;
- while (<$fh>) {
- chomp;
- $self->{current_info} = "$i.git $_";
- if (/\A$x40$/o && !defined($cmt)) {
- $cmt = $_;
- } elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\tm$/o) {
- reindex_oid($self, $sync, $git, $1);
- } elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\td$/o) {
- mark_deleted($self, $sync, $git, $1);
- }
- }
- $fh = undef;
- delete $self->{reindex_pipe};
- update_last_commit($self, $git, $i, $cmt) if defined $cmt;
+ index_epoch($self, $sync, $i);
}
# unindex is required for leftovers if "deletes" affect messages
--
EW
^ permalink raw reply related [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-05-30 6:52 7% [PATCH 0/4] v2writable: speedup no-op -index invocation Eric Wong
2019-05-30 6:52 6% ` [PATCH 2/4] v2writable: hoist out index_epoch sub 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).