user/dev discussion of public-inbox itself
 help / color / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/6] searchidx: split off index_xapian for msg_iter
Date: Fri,  3 Jan 2020 08:45:59 +0000
Message-ID: <20200103084603.8405-3-e@80x24.org> (raw)
In-Reply-To: <20200103084603.8405-1-e@80x24.org>

This ought to save some memory, but it's probably lost in the
noise given the cost of indexing.  Regardless it still reduces
the indentation level and makes future changes easier to read.
---
 lib/PublicInbox/SearchIdx.pm | 54 +++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 4cfbc4aa..5065974c 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -285,6 +285,33 @@ sub index_body ($$$) {
 	@$lines = ();
 }
 
+sub index_xapian { # msg_iter callback
+	my ($part, $depth, @idx) = @{$_[0]};
+	my ($self, $doc) = @{$_[1]};
+	my $ct = $part->content_type || 'text/plain';
+	my $fn = $part->filename;
+	if (defined $fn && $fn ne '') {
+		$self->index_text($fn, 1, 'XFN');
+	}
+
+	my ($s, undef) = msg_part_text($part, $ct);
+	defined $s or return;
+
+	my (@orig, @quot);
+	my @lines = split(/\n/, $s);
+	while (defined(my $l = shift @lines)) {
+		if ($l =~ /^>/) {
+			$self->index_body(\@orig, $doc) if @orig;
+			push @quot, $l;
+		} else {
+			$self->index_body(\@quot, 0) if @quot;
+			push @orig, $l;
+		}
+	}
+	$self->index_body(\@quot, 0) if @quot;
+	$self->index_body(\@orig, $doc) if @orig;
+}
+
 sub add_xapian ($$$$$) {
 	my ($self, $mime, $num, $oid, $mids, $mid0) = @_;
 	my $smsg = PublicInbox::SearchMsg->new($mime);
@@ -303,32 +330,7 @@ sub add_xapian ($$$$$) {
 	$self->index_text($subj, 1, 'S') if $subj;
 	$self->index_users($smsg);
 
-	msg_iter($mime, sub {
-		my ($part, $depth, @idx) = @{$_[0]};
-		my $ct = $part->content_type || 'text/plain';
-		my $fn = $part->filename;
-		if (defined $fn && $fn ne '') {
-			$self->index_text($fn, 1, 'XFN');
-		}
-
-		my ($s, undef) = msg_part_text($part, $ct);
-		defined $s or return;
-
-		my (@orig, @quot);
-		my @lines = split(/\n/, $s);
-		while (defined(my $l = shift @lines)) {
-			if ($l =~ /^>/) {
-				$self->index_body(\@orig, $doc) if @orig;
-				push @quot, $l;
-			} else {
-				$self->index_body(\@quot, 0) if @quot;
-				push @orig, $l;
-			}
-		}
-		$self->index_body(\@quot, 0) if @quot;
-		$self->index_body(\@orig, $doc) if @orig;
-	});
-
+	msg_iter($mime, \&index_xapian, [ $self, $doc ]);
 	foreach my $mid (@$mids) {
 		$self->index_text($mid, 1, 'XM');
 

  parent reply index

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-03  8:45 [PATCH 0/6] searchidx: minor fix and some cleanups Eric Wong
2020-01-03  8:45 ` [PATCH 1/6] searchidx: index_diff: allow /^$/ line as diff context Eric Wong
2020-01-03  8:45 ` Eric Wong [this message]
2020-01-03  8:46 ` [PATCH 3/6] searchidx: add_message: fix and make use of prototypes Eric Wong
2020-01-03  8:46 ` [PATCH 4/6] searchidx: simplify quote-splitting in index_body Eric Wong
2020-01-03  8:46 ` [PATCH 5/6] searchidx: index_text: use Xapian parameter names Eric Wong
2020-01-03  8:46 ` [PATCH 6/6] searchidx: remove_message: pedantic fix for v1 Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200103084603.8405-3-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror http://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.io/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git