From 7ec09f72bc12c3b882ba56c8bf16565f39afbc79 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 2 Jan 2025 22:50:31 +0000 Subject: [PATCH] extindex: use nproc_shards directly from IPC There's no reason to use it from the V2Writable namespace since it was moved to PublicInbox::IPC in commit 9225145d (ipc: move nproc_shards from v2writable, 2023-03-21) Import it early via `use' so we can take advantage of prototype checking while we're at it. --- lib/PublicInbox/ExtSearchIdx.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/ExtSearchIdx.pm b/lib/PublicInbox/ExtSearchIdx.pm index 4a4799789..970d5eb31 100644 --- a/lib/PublicInbox/ExtSearchIdx.pm +++ b/lib/PublicInbox/ExtSearchIdx.pm @@ -28,6 +28,7 @@ use PublicInbox::Spawn (); use PublicInbox::Search; use PublicInbox::SearchIdx qw(prepare_stack is_ancestor is_bad_blob update_checkpoint); +use PublicInbox::IPC qw(nproc_shards); use PublicInbox::OverIdx; use PublicInbox::MiscIdx; use PublicInbox::MID qw(mids); @@ -61,7 +62,7 @@ sub new { lock_path => "$dir/ei.lock", }, __PACKAGE__; $self->{shards} = $self->count_shards || - nproc_shards({ nproc => $opt->{jobs} }); + nproc_shards { nproc => $opt->{jobs} }; my $oidx = PublicInbox::OverIdx->new("$self->{xpfx}/over.sqlite3"); $self->{-no_fsync} = $oidx->{-no_fsync} = 1 if !$opt->{fsync}; $self->{-dangerous} = 1 if $opt->{dangerous}; @@ -1401,7 +1402,6 @@ sub eidx_watch { # public-inbox-extindex --watch main loop no warnings 'once'; *done = \&PublicInbox::V2Writable::done; *parallel_init = \&PublicInbox::V2Writable::parallel_init; -*nproc_shards = \&PublicInbox::V2Writable::nproc_shards; *sync_prepare = \&PublicInbox::V2Writable::sync_prepare; *index_todo = \&PublicInbox::V2Writable::index_todo; *count_shards = \&PublicInbox::V2Writable::count_shards; -- 2.47.2