From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 08/10] cindex: use read-only shards during prep phases
Date: Wed, 15 Mar 2023 10:11:03 +0000 [thread overview]
Message-ID: <20230315101105.3651530-8-e@80x24.org> (raw)
In-Reply-To: <20230315101105.3651530-1-e@80x24.org>
No need to open shards for read/write access when read-only
will do. Since we also control how a document gets sharded,
we'll also access the shard directly instead of letting Xapian
do the mappings.
--reindex didn't work properly before this change since it was
over-indexing. It is now broken in the opposite way in that it
doesn't do reindexing at all. --reindex will be implemented
properly in the future.
---
lib/PublicInbox/CodeSearchIdx.pm | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm
index a926886e..105c76d2 100644
--- a/lib/PublicInbox/CodeSearchIdx.pm
+++ b/lib/PublicInbox/CodeSearchIdx.pm
@@ -30,6 +30,7 @@ use PublicInbox::Spawn qw(spawn);
use PublicInbox::OnDestroy;
our $LIVE; # pid => callback
our $LIVE_JOBS;
+our @XDB_SHARDS_FLAT;
# stop walking history if we see >$SEEN_MAX existing commits, this assumes
# branches don't diverge by more than this number of commits...
@@ -273,9 +274,8 @@ sub prep_repo ($$) {
my $n = git_dir_hash($git_dir) % $self->{nshard};
my $shard = $repo->{shard} = bless { %$self, shard => $n }, ref($self);
delete @$shard{qw(lockfh lock_path)};
- local $shard->{xdb};
- my $xdb = $shard->idx_acquire;
- my @docids = docids_by_postlist($shard, 'P'.$git_dir);
+ my $xdb = $XDB_SHARDS_FLAT[$n] // die "BUG: shard[$n] undef";
+ my @docids = docids_by_postlist({ xdb => $xdb }, 'P'.$git_dir);
my $docid = shift(@docids) // return get_roots($self, $git);
if (@docids) {
warn "BUG: $git_dir indexed multiple times, culling\n";
@@ -298,8 +298,6 @@ 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: $!";
- local $self->{xdb};
- my $xdb = $self->{-opt}->{reindex} ? undef : $self->xdb;
my ($seen, $nchange, $nshard) = (0, 0, $self->{nshard});
my @shard_in;
for (0..($nshard - 1)) {
@@ -307,10 +305,10 @@ sub partition_refs ($$$) {
}
while (defined(my $cmt = <$fh>)) {
chomp $cmt;
- if ($xdb && seen($xdb, 'Q'.$cmt)) {
+ my $n = hex(substr($cmt, 0, 8)) % $nshard;
+ if (seen($XDB_SHARDS_FLAT[$n], 'Q'.$cmt)) {
last if ++$seen > $SEEN_MAX;
} else {
- my $n = hex(substr($cmt, 0, 8)) % $nshard;
say { $shard_in[$n] } $cmt or die "say: $!";
++$nchange;
$seen = 0;
@@ -450,6 +448,7 @@ sub scan_git_dirs ($) {
local $LIVE_JOBS = $self->{-opt}->{jobs} //
PublicInbox::IPC::detect_nproc() // 2;
local $LIVE = {};
+ local @XDB_SHARDS_FLAT = $self->xdb_shards_flat;
for (@{$self->{git_dirs}}) {
my $git = PublicInbox::Git->new($_);
my $prep_repo = PublicInbox::OnDestroy->new($$, \&prep_repo,
next prev parent reply other threads:[~2023-03-15 10:12 UTC|newest]
Thread overview: 11+ 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 ` Eric Wong [this message]
2023-03-15 10:11 ` [PATCH 09/10] search_idx_shard: Eric Wong
2023-03-15 10:11 ` [PATCH 10/10] cindex: read-only xdb shards fixup Eric Wong
-- strict thread matches above, loose matches on Subject: below --
2023-03-16 20:01 [PATCH 01/10] ipc: move nproc_shards from v2writable Eric Wong
2023-03-16 20:01 ` [PATCH 08/10] cindex: use read-only shards during prep phases 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230315101105.3651530-8-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).