From 5ce7e26b1d7efc2fb1bb5310a756e7c873145246 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@yhbt.net>
Date: Fri, 24 Jul 2020 05:56:00 +0000
Subject: searchidx: rename _xdb_{acquire,release} => idx_

The "xdb" prefix was inaccurate since it's used by
indexlevel=basic, which is Xapian-free.  The '_' (underscore)
prefix was also wrong for a method which is called across
package boundaries.
---
 lib/PublicInbox/SearchIdx.pm      | 12 ++++++------
 lib/PublicInbox/SearchIdxShard.pm |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 2d53b2d0..89c71679 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -77,7 +77,7 @@ sub new {
 
 sub need_xapian ($) { $_[0]->{indexlevel} =~ $xapianlevels }
 
-sub _xdb_release {
+sub idx_release {
 	my ($self, $wake) = @_;
 	if (need_xapian($self)) {
 		my $xdb = delete $self->{xdb} or croak 'not acquired';
@@ -101,7 +101,7 @@ sub load_xapian_writable () {
 	1;
 }
 
-sub _xdb_acquire {
+sub idx_acquire {
 	my ($self) = @_;
 	my $flag;
 	my $dir = $self->xdir;
@@ -735,7 +735,7 @@ sub _index_sync {
 		$git->cleanup;
 		delete $self->{txn};
 		$xdb->cancel_transaction if $xdb;
-		$xdb = _xdb_release($self);
+		$xdb = idx_release($self);
 
 		# ensure we leak no FDs to "git log" with Xapian <= 1.2
 		my $range = $lx eq '' ? $tip : "$lx..$tip";
@@ -766,7 +766,7 @@ sub _index_sync {
 		$self->{over}->rethread_done($opts) if $newest; # all done
 		$self->commit_txn_lazy;
 		$git->cleanup;
-		$xdb = _xdb_release($self, $nr);
+		$xdb = idx_release($self, $nr);
 		# let another process do some work...
 		$pr->("indexed $nr/$self->{ntodo}\n") if $pr && $nr;
 		if (!$newest) { # more to come
@@ -805,7 +805,7 @@ sub remote_close {
 		$? == 0 or die ref($self)." pid:$pid exited with: $?";
 	} else {
 		die "transaction in progress $self\n" if $self->{txn};
-		$self->_xdb_release if $self->{xdb};
+		idx_release($self) if $self->{xdb};
 	}
 }
 
@@ -821,7 +821,7 @@ sub remote_remove {
 
 sub _begin_txn {
 	my ($self) = @_;
-	my $xdb = $self->{xdb} || $self->_xdb_acquire;
+	my $xdb = $self->{xdb} || idx_acquire($self);
 	$self->{over}->begin_lazy if $self->{over};
 	$xdb->begin_transaction if $xdb;
 	$self->{txn} = 1;
diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm
index fd34e487..cb79f3dc 100644
--- a/lib/PublicInbox/SearchIdxShard.pm
+++ b/lib/PublicInbox/SearchIdxShard.pm
@@ -15,9 +15,9 @@ sub new {
 	my $ibx = $v2w->{ibx};
 	my $self = $class->SUPER::new($ibx, 1, $shard);
 	# create the DB before forking:
-	$self->_xdb_acquire;
+	$self->idx_acquire;
 	$self->set_indexlevel;
-	$self->_xdb_release;
+	$self->idx_release;
 	$self->spawn_worker($v2w, $shard) if $v2w->{parallel};
 	$self;
 }
@@ -56,7 +56,7 @@ sub shard_worker_loop ($$$$$) {
 		if ($line eq "commit\n") {
 			$self->commit_txn_lazy;
 		} elsif ($line eq "close\n") {
-			$self->_xdb_release;
+			$self->idx_release;
 		} elsif ($line eq "barrier\n") {
 			$self->commit_txn_lazy;
 			# no need to lock < 512 bytes is atomic under POSIX
-- 
cgit v1.2.3-24-ge0c7