From: Eric Wong (Contractor, The Linux Foundation) <e@80x24.org>
Date: Sat, 24 Feb 2018 00:40:09 +0000 (+0000)
Subject: searchidx: get rid of pointless index_blob wrapper
X-Git-Tag: v1.1.0-pre1~217
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=d5ab7a89e7ab6ef081e13a3d50a7fe9a3647613a;p=public-inbox.git

searchidx: get rid of pointless index_blob wrapper

This used to lookup the message in git, but no longer, so
remove a needless indirection layer and call add_message
directly.
---

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 0c3445d5..00b24d68 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -491,11 +491,6 @@ sub link_message {
 	$smsg->{doc}->add_term('G' . $tid);
 }
 
-sub index_blob {
-	my ($self, $mime, $bytes, $num, $blob) = @_;
-	$self->add_message($mime, $bytes, $num, $blob);
-}
-
 sub index_git_blob_id {
 	my ($doc, $pfx, $objid) = @_;
 
@@ -532,7 +527,7 @@ sub unindex_mm {
 sub index_mm2 {
 	my ($self, $mime, $bytes, $blob) = @_;
 	my $num = $self->{mm}->num_for(mid_clean(mid_mime($mime)));
-	index_blob($self, $mime, $bytes, $num, $blob);
+	add_message($self, $mime, $bytes, $num, $blob);
 }
 
 sub unindex_mm2 {
@@ -544,7 +539,7 @@ sub unindex_mm2 {
 sub index_both {
 	my ($self, $mime, $bytes, $blob) = @_;
 	my $num = index_mm($self, $mime);
-	index_blob($self, $mime, $bytes, $num, $blob);
+	add_message($self, $mime, $bytes, $num, $blob);
 }
 
 sub unindex_both {
@@ -711,7 +706,7 @@ sub _index_sync {
 		}
 	} else {
 		# user didn't install DBD::SQLite and DBI
-		rlog($self, $xlog, *index_blob, *unindex_blob, $cb);
+		rlog($self, $xlog, *add_message, *unindex_blob, $cb);
 	}
 }
 
diff --git a/lib/PublicInbox/SearchIdxPart.pm b/lib/PublicInbox/SearchIdxPart.pm
index bffa5325..ee79e08e 100644
--- a/lib/PublicInbox/SearchIdxPart.pm
+++ b/lib/PublicInbox/SearchIdxPart.pm
@@ -59,7 +59,7 @@ sub partition_worker_loop ($$$) {
 			my $n = read($r, my $msg, $len) or die "read: $!\n";
 			$n == $len or die "short read: $n != $len\n";
 			my $mime = PublicInbox::MIME->new(\$msg);
-			$self->index_blob($mime, $len, $artnum, $object_id);
+			$self->add_message($mime, $len, $artnum, $object_id);
 		}
 	}
 	warn "$$ still in transaction\n" if $txn;