-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
#
# Represents a public-inbox (which may have multiple mailing addresses)
use warnings;
use PublicInbox::Git;
use PublicInbox::MID qw(mid2path);
+use Devel::Peek qw(SvREFCNT);
my $cleanup_timer;
eval {
my $CLEANUP = {}; # string(inbox) -> inbox
sub cleanup_task () {
$cleanup_timer = undef;
- delete $_->{git} for values %$CLEANUP;
+ for my $ibx (values %$CLEANUP) {
+ foreach my $f (qw(git mm search)) {
+ delete $ibx->{$f} if SvREFCNT($ibx->{$f}) == 1;
+ }
+ }
$CLEANUP = {};
}
sub _cleanup_later ($) {
my ($self) = @_;
+ return unless $PublicInbox::EvCleanup::ENABLED;
$cleanup_timer ||= PublicInbox::EvCleanup::later(*cleanup_task);
$CLEANUP->{"$self"} = $self;
}
_set_limiter($opts, $pi_config, 'httpbackend');
_set_uint($opts, 'feedmax', 25);
$opts->{nntpserver} ||= $pi_config->{'publicinbox.nntpserver'};
+ my $dir = $opts->{mainrepo};
+ if (defined $dir && -f "$dir/msgmap.sqlite3") { # XXX DIRTY
+ $opts->{version} = 2;
+ }
bless $opts, $class;
}
sub git {
my ($self) = @_;
$self->{git} ||= eval {
- my $g = PublicInbox::Git->new($self->{mainrepo});
+ my $git_dir = $self->{mainrepo};
+ $git_dir .= '/all.git' if (($self->{version} || 1) == 2);
+ my $g = PublicInbox::Git->new($git_dir);
$g->{-httpbackend_limiter} = $self->{-httpbackend_limiter};
+ _cleanup_later($self);
$g;
};
}
sub mm {
my ($self) = @_;
- $self->{mm} ||= eval { PublicInbox::Msgmap->new($self->{mainrepo}) };
+ $self->{mm} ||= eval {
+ _cleanup_later($self);
+ my $dir = $self->{mainrepo};
+ if (($self->{version} || 1) >= 2) {
+ PublicInbox::Msgmap->new_file("$dir/msgmap.sqlite3");
+ } else {
+ PublicInbox::Msgmap->new($dir);
+ }
+ };
}
sub search {
my ($self) = @_;
$self->{search} ||= eval {
- PublicInbox::Search->new($self->{mainrepo}, $self->{altid});
+ _cleanup_later($self);
+ PublicInbox::Search->new($self, $self->{altid});
};
}
# backwards compat to fallback to msg_by_mid
# TODO: remove if we bump SCHEMA_VERSION in Search.pm:
- defined(my $blob = $smsg->blob) or return msg_by_mid($self, $smsg->mid);
+ defined(my $blob = $smsg->{blob}) or
+ return msg_by_path($self, mid2path($smsg->mid), $ref);
my $str = git($self)->cat_file($blob, $ref);
$$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s if $str;
sub msg_by_mid ($$;$) {
my ($self, $mid, $ref) = @_;
- msg_by_path($self, mid2path($mid), $ref);
+ my $srch = search($self) or
+ return msg_by_path($self, mid2path($mid), $ref);
+ my $smsg;
+ $srch->retry_reopen(sub {
+ $smsg = $srch->lookup_skeleton($mid) and $smsg->load_expand;
+ });
+ $smsg ? msg_by_smsg($self, $smsg, $ref) : undef;
}
1;