# Copyright (C) 2018 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+
+# used to interface with a single Xapian partition in V2 repos.
+# See L<public-inbox-v2-format(5)> for more info on how we partition Xapian
package PublicInbox::SearchIdxPart;
use strict;
use warnings;
use base qw(PublicInbox::SearchIdx);
sub new {
- my ($class, $v2writable, $part, $skel) = @_;
+ my ($class, $v2writable, $part) = @_;
my $self = $class->SUPER::new($v2writable->{-inbox}, 1, $part);
- $self->{skeleton} = $skel;
- # create the DB:
+ # create the DB before forking:
$self->_xdb_acquire;
$self->_xdb_release;
$self->spawn_worker($v2writable, $part) if $v2writable->{parallel};
my $pid = fork;
defined $pid or die "fork failed: $!\n";
if ($pid == 0) {
- $v2writable->atfork_child;
+ my $bnote = $v2writable->atfork_child;
$v2writable = undef;
- close $w;
+ close $w or die "failed to close: $!";
# F_SETPIPE_SZ = 1031 on Linux; increasing the pipe size here
# speeds V2Writable batch imports across 8 cores by nearly 20%
fcntl($r, 1031, 1048576) if $^O eq 'linux';
- eval { partition_worker_loop($self, $r, $part) };
+ eval { partition_worker_loop($self, $r, $part, $bnote) };
die "worker $part died: $@\n" if $@;
die "unexpected MM $self->{mm}" if $self->{mm};
exit;
}
$self->{pid} = $pid;
$self->{w} = $w;
- close $r;
+ close $r or die "failed to close: $!";
}
-sub partition_worker_loop ($$$) {
- my ($self, $r, $part) = @_;
+sub partition_worker_loop ($$$$) {
+ my ($self, $r, $part, $bnote) = @_;
$0 = "pi-v2-partition[$part]";
$self->begin_txn_lazy;
while (my $line = $r->getline) {
if ($line eq "commit\n") {
$self->commit_txn_lazy;
- $self->{skeleton}->remote_commit;
} elsif ($line eq "close\n") {
$self->_xdb_release;
} elsif ($line eq "barrier\n") {
$self->commit_txn_lazy;
- print { $self->{skeleton}->{w} } "barrier $part\n" or
- die "write failed to skeleton: $!\n";
+ # no need to lock < 512 bytes is atomic under POSIX
+ print $bnote "barrier $part\n" or
+ die "write failed for barrier $!\n";
} elsif ($line =~ /\AD ([a-f0-9]{40,}) (.+)\n\z/s) {
my ($oid, $mid) = ($1, $2);
$self->begin_txn_lazy;
$w->flush or die "failed to flush: $!";
} else {
$self->commit_txn_lazy;
- $self->{skeleton}->remote_commit;
}
}