From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 10/10] cindex: read-only xdb shards fixup
Date: Wed, 15 Mar 2023 10:11:05 +0000 [thread overview]
Message-ID: <20230315101105.3651530-10-e@80x24.org> (raw)
In-Reply-To: <20230315101105.3651530-1-e@80x24.org>
---
lib/PublicInbox/CodeSearchIdx.pm | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm
index 105c76d2..02c9ed84 100644
--- a/lib/PublicInbox/CodeSearchIdx.pm
+++ b/lib/PublicInbox/CodeSearchIdx.pm
@@ -275,6 +275,7 @@ sub prep_repo ($$) {
my $shard = $repo->{shard} = bless { %$self, shard => $n }, ref($self);
delete @$shard{qw(lockfh lock_path)};
my $xdb = $XDB_SHARDS_FLAT[$n] // die "BUG: shard[$n] undef";
+ $xdb->reopen;
my @docids = docids_by_postlist({ xdb => $xdb }, 'P'.$git_dir);
my $docid = shift(@docids) // return get_roots($self, $git);
if (@docids) {
@@ -298,14 +299,16 @@ sub partition_refs ($$$) {
sysseek($refs, 0, SEEK_SET) or die "seek: $!"; # for rev-list --stdin
my $fh = $git->popen(qw(rev-list --stdin), undef, { 0 => $refs });
close $refs or die "close: $!";
- my ($seen, $nchange, $nshard) = (0, 0, $self->{nshard});
- my @shard_in;
- for (0..($nshard - 1)) {
- open $shard_in[$_], '+>', undef or die "open: $!";
- }
+ my ($seen, $nchange) = (0, 0);
+ my @shard_in = map {
+ $_->reopen;
+ open my $fh, '+>', undef or die "open: $!";
+ $fh;
+ } @XDB_SHARDS_FLAT;
+
while (defined(my $cmt = <$fh>)) {
chomp $cmt;
- my $n = hex(substr($cmt, 0, 8)) % $nshard;
+ my $n = hex(substr($cmt, 0, 8)) % scalar(@XDB_SHARDS_FLAT);
if (seen($XDB_SHARDS_FLAT[$n], 'Q'.$cmt)) {
last if ++$seen > $SEEN_MAX;
} else {
prev parent reply other threads:[~2023-03-15 10:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-15 10:10 [PATCH 01/10] ipc: move nproc_shards from v2writable Eric Wong
2023-03-15 10:10 ` [PATCH 02/10] search: relocate all_terms from lei_search Eric Wong
2023-03-15 10:10 ` [PATCH 03/10] admin: hoist out resolve_git_dir Eric Wong
2023-03-15 10:10 ` [PATCH 04/10] admin: ensure resolved GIT_DIR is absolute Eric Wong
2023-03-15 10:11 ` [PATCH 05/10] test_common: create_inbox: use `$!' properly on mkdir failure Eric Wong
2023-03-15 10:11 ` [PATCH 06/10] codesearch: initial cut w/ -cindex tool Eric Wong
2023-03-15 10:11 ` [PATCH 07/10] cindex: parallelize prep phases Eric Wong
2023-03-15 10:11 ` [PATCH 08/10] cindex: use read-only shards during " Eric Wong
2023-03-15 10:11 ` [PATCH 09/10] search_idx_shard: Eric Wong
2023-03-15 10:11 ` Eric Wong [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230315101105.3651530-10-e@80x24.org \
--to=e@80x24.org \
--cc=spew@80x24.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.
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).