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";
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});
sub add_message {
# mime = Email::MIME object
my ($self, $mime, $smsg) = @_;
- my $mids = mids_for_index($mime->header_obj);
+ 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 {
# order matters, overview stores every possible piece of
# data in doc_data (deflated). Xapian only stores a subset
# 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, $self);
+ $over->add_overview($mime, $smsg);
}
if (need_xapian($self)) {
add_xapian($self, $mime, $smsg, $mids);
$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};