From dff966c6e7e804b4e760aae39dda0b2c1a6ef30f Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 27 Oct 2020 07:54:08 +0000 Subject: search: xdb_sharded: make this a public method for ExtSearch We can simplify callers by using $self->{xpfx} instead of passing another arg on the stack. --- lib/PublicInbox/Search.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/PublicInbox/Search.pm') diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index 5a57657f..71417d5e 100644 --- a/lib/PublicInbox/Search.pm +++ b/lib/PublicInbox/Search.pm @@ -190,9 +190,9 @@ sub xdir ($;$) { } } -sub _xdb_sharded { - my ($self, $xpfx) = @_; - opendir(my $dh, $xpfx) or return; # not initialized yet +sub xdb_sharded { + my ($self) = @_; + opendir(my $dh, $self->{xpfx}) or return; # not initialized yet # We need numeric sorting so shard[0] is first for reading # Xapian metadata, if needed @@ -200,7 +200,7 @@ sub _xdb_sharded { return if !defined($last); my (@xdb, $slow_phrase); for (0..$last) { - my $shard_dir = "$xpfx/$_"; + my $shard_dir = "$self->{xpfx}/$_"; if (-d $shard_dir && -r _) { push @xdb, $X{Database}->new($shard_dir); $slow_phrase ||= -f "$shard_dir/iamchert"; @@ -221,7 +221,7 @@ sub _xdb { my $dir = xdir($self, 1); $self->{qp_flags} //= $QP_FLAGS; if ($self->{ibx_ver} >= 2) { - _xdb_sharded($self, $dir); + xdb_sharded($self); } else { $self->{qp_flags} |= FLAG_PHRASE() if !-f "$dir/iamchert"; $X{Database}->new($dir); -- cgit v1.2.3-24-ge0c7