From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id E5AB21F44D for ; Sat, 23 Mar 2024 19:54:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1711223675; bh=RB0HwsvFGUO2izOZ52Qo9g3aO/sDHoUAJEuSa/RiOBo=; h=From:To:Subject:Date:From; b=u7JLSRsw9yaqWzu1xbW8DY8QE9u/t3QpwAiBWM80jKPyyLi5rhA62HH1GWCA5oK13 5Zwhm2OW4nap+NfX9ILCDN7bxsYFY+XriZP/8zdKmLLiC5FqHOjF5I1KOIK3faTjBn kM8/WhjLTVgkN/JM6lUAGddX9TSpv132cxEHEM90= From: Eric Wong To: spew@80x24.org Subject: [PATCH] codesearch: warn about pruned roots Date: Sat, 23 Mar 2024 19:54:34 +0000 Message-ID: <20240323195434.2317470-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: --- lib/PublicInbox/CodeSearch.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/CodeSearch.pm b/lib/PublicInbox/CodeSearch.pm index cceff3c6..950f25c2 100644 --- a/lib/PublicInbox/CodeSearch.pm +++ b/lib/PublicInbox/CodeSearch.pm @@ -222,10 +222,11 @@ sub _cmt_ct { # retry_reopen cb my ($self, $cmt) = @_; my @ids = sort { $a <=> $b } $self->docids_by_postlist('Q'.$cmt); if (!@ids) { - carp "W: commit $cmt not indexed"; - return (time + 3600); + carp +"W: commit $cmt not indexed (--prune isn't exhaustive, yet)"; + return; } - scalar(@ids) == 1 or carp "BUG? `$cmt' indexed multiple times\n"; + scalar(@ids) == 1 or carp "BUG? commit $cmt indexed multiple times\n"; for my $id (@ids) { my $doc = $self->get_doc($id) or next; return int_val($doc, CT); @@ -249,6 +250,7 @@ BUG? (non-fatal) `$git_dir' not indexed in $self->{topdir} if (@ids > 1) { @ret = uniqstr(@ret); my %ct = map { $_ => commit_ct($self, $_) } @ret; + @ret = grep { defined($ct{$_}) } @ret; @ret = sort { $ct{$a} <=> $ct{$b} } @ret ; } @ret; @@ -264,7 +266,8 @@ sub paths2roots { # for diagnostics my %ct; for my $root_oidhex (keys %$tmp) { my $paths = delete $tmp->{$root_oidhex}; - $ct{$root_oidhex} = commit_ct($self, $root_oidhex); + $ct{$root_oidhex} = commit_ct($self, $root_oidhex) // + next; push @{$ret{$_}}, $root_oidhex for @$paths; } for my $oids (values %ret) {