From 21ab8f3cc530d9483091f32c0865ba1ce867cef8 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 9 Sep 2016 00:01:25 +0000 Subject: search: fix space regressions from recent changes As of Xapian 1.0.4 (from 2007) is possible to use Search::Xapian::QueryParser::add_prefix multiple times with the same user field name but different term prefixes. This brings my current git@vger mirror from 6.5GB to 2.1GB (both sizes are after xapian-compact). --- lib/PublicInbox/Search.pm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'lib/PublicInbox/Search.pm') diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index f74129d5..c8e297f4 100644 --- a/lib/PublicInbox/Search.pm +++ b/lib/PublicInbox/Search.pm @@ -60,20 +60,23 @@ my %bool_pfx_external = ( my %prob_prefix = ( # for mairix compatibility s => 'S', - m => 'Q', # 'mid' is exact, 'm' can do partial + m => 'XMID', # 'mid:' (bool) is exact, 'm:' (prob) can do partial f => 'A', t => 'XTO', - tc => 'XTC', + tc => 'XTO XCC', c => 'XCC', - tcf => 'XTCF', - b => 'XBODY', - bs => 'XBS', + tcf => 'XTO XCC A', + b => 'XNQ XQUOT', + bs => 'XNQ XQUOT S', # n.b.: leaving out "a:" alias for "tcf:" even though # mairix supports it. It is only mentioned in passing in mairix(1) # and the extra two letters are not significantly longer. q => 'XQUOT', nq => 'XNQ', + + # default: + '' => 'XMID S A XNQ XQUOT', ); # not documenting m: and mid: for now, the using the URLs works w/o Xapian @@ -241,7 +244,7 @@ EOF } while (my ($name, $prefix) = each %prob_prefix) { - $qp->add_prefix($name, $prefix); + $qp->add_prefix($name, $_) foreach split(/ /, $prefix); } $self->{query_parser} = $qp; -- cgit v1.2.3-24-ge0c7