about summary refs log tree commit homepage
path: root/lib/PublicInbox
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2020-10-27 07:54:08 +0000
committerEric Wong <e@80x24.org>2020-11-07 10:16:14 +0000
commitdff966c6e7e804b4e760aae39dda0b2c1a6ef30f (patch)
treedf7c0f4b3c3af5051c387fd43ef7b9e65729d2cf /lib/PublicInbox
parent6cdfe12cbcdd87ecfdafa487e4d78c3a12ac551e (diff)
downloadpublic-inbox-dff966c6e7e804b4e760aae39dda0b2c1a6ef30f.tar.gz
We can simplify callers by using $self->{xpfx} instead of
passing another arg on the stack.
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r--lib/PublicInbox/ExtSearch.pm2
-rw-r--r--lib/PublicInbox/Search.pm10
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/PublicInbox/ExtSearch.pm b/lib/PublicInbox/ExtSearch.pm
index 9bbe7857..8997cd54 100644
--- a/lib/PublicInbox/ExtSearch.pm
+++ b/lib/PublicInbox/ExtSearch.pm
@@ -23,7 +23,7 @@ sub new {
 # overrides PublicInbox::Search::_xdb
 sub _xdb {
         my ($self) = @_;
-        $self->_xdb_sharded($self->{xpfx});
+        $self->xdb_sharded;
 }
 
 # same as per-inbox ->over, for now...
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);