* [PATCH 2/2] cindex: avoid recursion on prune
2023-12-06 21:12 6% [PATCH 0/2] cindex bug fixes Eric Wong
@ 2023-12-06 21:12 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-12-06 21:12 UTC (permalink / raw)
To: meta
There's no need to recurse and trigger deep recursion warnings
when we hit a coderepo with a known hash (SHA-1 vs SHA-256).
Noticed while pruning the 1200+ repos on a git.kernel.org
mirror.
---
lib/PublicInbox/CodeSearchIdx.pm | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm
index 20aac584..967933f2 100644
--- a/lib/PublicInbox/CodeSearchIdx.pm
+++ b/lib/PublicInbox/CodeSearchIdx.pm
@@ -909,21 +909,23 @@ sub prep_alternate_read { # run_git cb for config extensions.objectFormat
sub prep_alternate_start {
my ($self, $git, $run_prune) = @_;
- my $o = $git->git_path('objects');
+ local $self->{xdb};
+ my ($o, $n, @ids, @fmt);
+start:
+ $o = $git->git_path('objects');
while (!-d $o) {
$git = shift(@PRUNEQ) // return;
$o = $git->git_path('objects');
}
- my $n = git_dir_hash($git->{git_dir}) % scalar(@RDONLY_XDB);
- local $self->{xdb} = $RDONLY_XDB[$n] // croak("BUG: no shard[$n]");
- my @ids = $self->docids_by_postlist('P'.$git->{git_dir});
- my @fmt = @ids ? xap_terms('H', $self->{xdb}, $ids[0]) : ();
+ $n = git_dir_hash($git->{git_dir}) % scalar(@RDONLY_XDB);
+ $self->{xdb} = $RDONLY_XDB[$n] // croak("BUG: no shard[$n]");
+ @ids = $self->docids_by_postlist('P'.$git->{git_dir});
+ @fmt = @ids ? xap_terms('H', $self->{xdb}, $ids[0]) : ();
@fmt > 1 and warn "BUG? multi `H' for shard[$n] #$ids[0]: @fmt";
if (@fmt) { # cache hit
- @PRUNEQ and
- prep_alternate_start($self, shift(@PRUNEQ), $run_prune);
prep_alternate_end $o, $fmt[0];
+ $git = shift(@PRUNEQ) and goto start;
} else { # compatibility w/ early cidx format
run_git([qw(config extensions.objectFormat)], { quiet => 1 },
\&prep_alternate_read, $self, $git, $o, $ids[0], $n,
^ permalink raw reply related [relevance 7%]
* [PATCH 0/2] cindex bug fixes
@ 2023-12-06 21:12 6% Eric Wong
2023-12-06 21:12 7% ` [PATCH 2/2] cindex: avoid recursion on prune Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-12-06 21:12 UTC (permalink / raw)
To: meta
Eric Wong (2):
t/cindex: fix test when worktree PWD is a symlink
cindex: avoid recursion on prune
lib/PublicInbox/CodeSearchIdx.pm | 16 +++++++++-------
t/cindex.t | 5 +++--
2 files changed, 12 insertions(+), 9 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-12-06 21:12 6% [PATCH 0/2] cindex bug fixes Eric Wong
2023-12-06 21:12 7% ` [PATCH 2/2] cindex: avoid recursion on prune 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).