* [PATCH 04/10] search: fix space regressions from recent changes
2016-09-09 0:01 6% [PATCH 0/10] search: more mairix prefix compatibility Eric Wong
@ 2016-09-09 0:01 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2016-09-09 0:01 UTC (permalink / raw)
To: meta
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 +++++++++------
lib/PublicInbox/SearchIdx.pm | 25 ++++---------------------
2 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index f74129d..c8e297f 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;
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index cd27a29..ae89060 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -129,15 +129,9 @@ sub index_users ($$) {
$tg->index_text($from, 1, 'A'); # A - author
$tg->increase_termpos;
-
$tg->index_text($to, 1, 'XTO') if $to ne '';
+ $tg->increase_termpos;
$tg->index_text($cc, 1, 'XCC') if $cc ne '';
- my $tc = join("\t", $to, $cc);
- $tg->index_text($tc, 1, 'XTC') if $tc ne '';
- my $tcf = join("\t", $tc, $from);
- $tg->index_text($tcf, 1, 'XTCF') if $tcf ne '';
-
- $tg->index_text($from);
$tg->increase_termpos;
}
@@ -173,12 +167,7 @@ sub add_message {
my $tg = $self->term_generator;
$tg->set_document($doc);
- if ($subj) {
- $tg->index_text($subj, 1, 'S');
- $tg->index_text($subj, 1, 'XBS');
- }
- $tg->increase_termpos;
- $tg->index_text($subj) if $subj;
+ $tg->index_text($subj, 1, 'S') if $subj;
$tg->increase_termpos;
index_users($tg, $smsg);
@@ -204,25 +193,19 @@ sub add_message {
if (@quot) {
my $s = join("\n", @quot);
@quot = ();
- $tg->index_text($s, 1, 'XQUOT');
- $tg->index_text($s, 0, 'XBS');
- $tg->index_text($s, 0, 'XBODY');
- $tg->index_text($s, 0);
+ $tg->index_text($s, 0, 'XQUOT');
$tg->increase_termpos;
}
if (@orig) {
my $s = join("\n", @orig);
@orig = ();
$tg->index_text($s, 1, 'XNQ');
- $tg->index_text($s, 1, 'XBS');
- $tg->index_text($s, 1, 'XBODY');
- $tg->index_text($s);
$tg->increase_termpos;
}
});
link_message($self, $smsg, $old_tid);
- $tg->index_text($mid, 1);
+ $tg->index_text($mid, 1, 'XMID');
$doc->set_data($smsg->to_doc_data($blob));
if (my $altid = $self->{-altid}) {
--
EW
^ permalink raw reply related [relevance 7%]
* [PATCH 0/10] search: more mairix prefix compatibility
@ 2016-09-09 0:01 6% Eric Wong
2016-09-09 0:01 7% ` [PATCH 04/10] search: fix space regressions from recent changes Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2016-09-09 0:01 UTC (permalink / raw)
To: meta
This brings us closer to the behavior of mairix(1) for search
by supporting n:, t:, c:, f:, tc:, tcf:, n:, b:, and bs:
prefixes as documented in the mairix(1) manpage.
We also introduce the use of q: and nq: prefixes for quoted and
non-quoted text, respectively.
There is a schema version change in [PATCH 7/10] to maintain
compatibility with Debian 7.x wheezy installs. The in-place
reindexing would've been expensive anyways, so perhaps the
schema bump is a good idea, anyways, as creating a fresh index
should be faster than --reindex.
Eric Wong (10):
search: allow searching user fields (To/Cc/From)
search: drop longer subject: prefix for search
search: more granular message body searching
search: fix space regressions from recent changes
search: match quote detection behavior of view
search: increase term positions for each quoted hunk
search: fix compatibility with Debian wheezy
search: avoid mindlessly calling body_set
search: match the behavior of WWW for indexing text
search: index attachment filenames
lib/PublicInbox/Search.pm | 32 +++++++++---
lib/PublicInbox/SearchIdx.pm | 104 ++++++++++++++++++++++++-------------
t/search.t | 120 ++++++++++++++++++++++++++++++++++++++++---
3 files changed, 206 insertions(+), 50 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-09-09 0:01 6% [PATCH 0/10] search: more mairix prefix compatibility Eric Wong
2016-09-09 0:01 7% ` [PATCH 04/10] search: fix space regressions from recent changes Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).