From 44ff716b116f10ae42372f9f517356000636e571 Mon Sep 17 00:00:00 2001 From: "Eric Wong (Contractor, The Linux Foundation)" Date: Fri, 2 Mar 2018 20:46:55 +0000 Subject: search: revert to using 'Q' as a uniQue id per-Xapian conventions 'Q' is merely a convention in the Xapian world, and is close enough to unique for practical purposes, so stop using XMID and gain a little more term length as a result. --- lib/PublicInbox/SearchIdx.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/PublicInbox/SearchIdx.pm') diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm index 57aed75c..61dc0577 100644 --- a/lib/PublicInbox/SearchIdx.pm +++ b/lib/PublicInbox/SearchIdx.pm @@ -19,7 +19,7 @@ use POSIX qw(strftime); require PublicInbox::Git; use constant { - MAX_MID_SIZE => 244, # max term size - 1 in Xapian + MAX_MID_SIZE => 244, # max term size (Xapian limitation) - length('Q') PERM_UMASK => 0, OLD_PERM_GROUP => 1, OLD_PERM_EVERYBODY => 2, @@ -302,7 +302,7 @@ sub add_message { } $smsg = PublicInbox::SearchMsg->new($mime); my $doc = $smsg->{doc}; - $doc->add_term('XMID' . $mid); + $doc->add_term('Q' . $mid); my $subj = $smsg->subject; my $xpath; @@ -404,7 +404,7 @@ sub remove_message { $mid = mid_clean($mid); eval { - my ($head, $tail) = $self->find_doc_ids('XMID' . $mid); + my ($head, $tail) = $self->find_doc_ids('Q' . $mid); if ($head->equal($tail)) { warn "cannot remove non-existent <$mid>\n"; } @@ -721,7 +721,7 @@ sub create_ghost { my $tid = $self->next_thread_id; my $doc = Search::Xapian::Document->new; - $doc->add_term('XMID' . $mid); + $doc->add_term('Q' . $mid); $doc->add_term('G' . $tid); $doc->add_term('T' . 'ghost'); -- cgit v1.2.3-24-ge0c7