ibx_ver => $version,
indexlevel => $indexlevel,
}, $class;
+ $self->{-set_indexlevel_once} = 1 if $indexlevel eq 'medium';
$ibx->umask_prepare;
if ($version == 1) {
$self->{lock_path} = "$inboxdir/ssoma.lock";
defined $s or return;
# split off quoted and unquoted blocks:
- my @sections = split(/((?:^>[^\n]*\n)+)/sm, $s);
+ my @sections = PublicInbox::MsgIter::split_quotes($s);
$part = $s = undef;
index_body($self, $_, /\A>/ ? 0 : $doc) for @sections;
}
-sub add_xapian ($$$$$$) {
- my ($self, $mime, $num, $oid, $mids, $mid0) = @_;
- my $smsg = PublicInbox::Smsg->new($mime);
+sub add_xapian ($$$$) {
+ my ($self, $mime, $smsg, $mids) = @_;
+ $smsg->{mime} = $mime; # XXX dangerous
my $hdr = $mime->header_obj;
- $smsg->{ds} = msg_datestamp($hdr, $self->{autime});
- $smsg->{ts} = msg_timestamp($hdr, $self->{cotime});
my $doc = $X->{Document}->new;
my $subj = $smsg->subject;
add_val($doc, PublicInbox::Search::TS(), $smsg->{ts});
index_text($self, join(' ', @long), 1, 'XM');
}
}
- $smsg->{to} = $smsg->{cc} = '';
- $smsg->{blob} = $oid;
- $smsg->{mid} = $mid0;
+ $smsg->{to} = $smsg->{cc} = ''; # WWW doesn't need these, only NNTP
PublicInbox::OverIdx::parse_references($smsg, $hdr, $mids);
my $data = $smsg->to_doc_data;
$doc->set_data($data);
}
}
$doc->add_boolean_term('Q' . $_) foreach @$mids;
- $self->{xdb}->replace_document($num, $doc);
+ $self->{xdb}->replace_document($smsg->{num}, $doc);
}
sub _msgmap_init ($) {
sub add_message {
# mime = Email::MIME object
- my ($self, $mime, $bytes, $num, $oid, $mid0) = @_;
- my $mids = mids_for_index($mime->header_obj);
- $mid0 //= $mids->[0]; # v1 compatibility
- $num //= do { # v1
+ my ($self, $mime, $smsg) = @_;
+ my $hdr = $mime->header_obj;
+ my $mids = mids_for_index($hdr);
+ $smsg //= bless { blob => '' }, 'PublicInbox::Smsg'; # test-only compat
+ $smsg->{mid} //= $mids->[0]; # v1 compatibility
+ $smsg->{num} //= do { # v1
_msgmap_init($self);
index_mm($self, $mime);
};
+
+ # v1 and tests only:
+ $smsg->{ds} //= msg_datestamp($hdr, $self->{autime});
+ $smsg->{ts} //= msg_timestamp($hdr, $self->{cotime});
+
eval {
- if (need_xapian($self)) {
- add_xapian($self, $mime, $num, $oid, $mids, $mid0);
+ # order matters, overview stores every possible piece of
+ # data in doc_data (deflated). Xapian only stores a subset
+ # of the fields which exist in over.sqlite3. We may stop
+ # storing doc_data in Xapian sometime after we get multi-inbox
+ # search working.
+ if (my $over = $self->{over}) { # v1 only
+ $over->add_overview($mime, $smsg);
}
- if (my $over = $self->{over}) {
- $over->add_overview($mime, $bytes, $num, $oid, $mid0,
- $self);
+ if (need_xapian($self)) {
+ add_xapian($self, $mime, $smsg, $mids);
}
};
warn "failed to index message <".join('> <',@$mids).">: $@\n";
return undef;
}
- $num;
+ $smsg->{num};
}
# returns begin and end PostingIterator
sub unindex_blob {
my ($self, $mime) = @_;
- my $mid = eval { mid_clean(mid_mime($mime)) };
+ my $mid = eval { mid_mime($mime) };
$self->remove_message($mid) if defined $mid;
}
sub index_mm {
my ($self, $mime) = @_;
- my $mid = mid_clean(mid_mime($mime));
+ my $mid = mid_mime($mime);
my $mm = $self->{mm};
my $num;
sub unindex_mm {
my ($self, $mime) = @_;
- $self->{mm}->mid_delete(mid_clean(mid_mime($mime)));
+ $self->{mm}->mid_delete(mid_mime($mime));
}
sub index_both {
- my ($self, $mime, $bytes, $blob) = @_;
+ my ($self, $mime, $smsg) = @_;
my $num = index_mm($self, $mime);
- add_message($self, $mime, $bytes, $num, $blob);
+ $smsg->{num} = $num;
+ add_message($self, $mime, $smsg);
}
sub unindex_both {
next;
}
my $mime = do_cat_mail($git, $blob, \$bytes) or next;
+ my $smsg = bless {}, 'PublicInbox::Smsg';
batch_adjust(\$max, $bytes, $batch_cb, $latest, ++$nr);
- $add_cb->($self, $mime, $bytes, $blob);
+ $smsg->{blob} = $blob;
+ $smsg->{bytes} = $bytes;
+ $add_cb->($self, $mime, $smsg);
} elsif ($line =~ /$delmsg/o) {
my $blob = $1;
$D{$blob} = 1;
$latest = $1;
$newest ||= $latest;
} elsif ($line =~ /^author .*? ([0-9]+) [\-\+][0-9]+$/) {
- $self->{over}->{autime} = $self->{autime} = $1;
+ $self->{autime} = $1;
} elsif ($line =~ /^committer .*? ([0-9]+) [\-\+][0-9]+$/) {
- $self->{over}->{cotime} = $self->{cotime} = $1;
+ $self->{cotime} = $1;
}
}
close($log) or die "git log failed: \$?=$?";
});
}
+# store 'indexlevel=medium' in v2 shard=0 and v1 (only one shard)
+# This metadata is read by Admin::detect_indexlevel:
+sub set_indexlevel {
+ my ($self) = @_;
+
+ if (!$self->{shard} && # undef or 0, not >0
+ delete($self->{-set_indexlevel_once})) {
+ my $xdb = $self->{xdb};
+ my $level = $xdb->get_metadata('indexlevel');
+ if (!$level || $level ne 'medium') {
+ $xdb->set_metadata('indexlevel', 'medium');
+ }
+ }
+}
+
sub commit_txn_lazy {
my ($self) = @_;
delete $self->{txn} or return;
$self->{-inbox}->with_umask(sub {
if (my $xdb = $self->{xdb}) {
-
- # store 'indexlevel=medium' in v2 shard=0 and
- # v1 (only one shard)
- # This metadata is read by Admin::detect_indexlevel:
- if (!$self->{shard} # undef or 0, not >0
- && $self->{indexlevel} eq 'medium') {
- $xdb->set_metadata('indexlevel', 'medium');
- }
-
+ set_indexlevel($self);
$xdb->commit_transaction;
}
$self->{over}->commit_lazy if $self->{over};