use base qw(PublicInbox::SearchIdx);
sub new {
- my ($class, $v2writable, $part, $threader) = @_;
+ my ($class, $v2writable, $part, $skel) = @_;
my $self = $class->SUPER::new($v2writable->{-inbox}, 1, $part);
- $self->{threader} = $threader;
+ $self->{skeleton} = $skel;
my ($r, $w);
pipe($r, $w) or die "pipe failed: $!\n";
binmode $r, ':raw';
# speeds V2Writable batch imports across 8 cores by nearly 20%
fcntl($r, 1031, 1048576) if $^O eq 'linux';
- eval { partition_worker_loop($self, $r) };
+ eval { partition_worker_loop($self, $r, $part) };
die "worker $part died: $@\n" if $@;
die "unexpected MM $self->{mm}" if $self->{mm};
exit;
$self;
}
-sub partition_worker_loop ($$) {
- my ($self, $r) = @_;
+sub partition_worker_loop ($$$) {
+ my ($self, $r, $part) = @_;
+ $0 = "pi-v2-partition[$part]";
my $xdb = $self->_xdb_acquire;
$xdb->begin_transaction;
my $txn = 1;
if ($line eq "commit\n") {
$xdb->commit_transaction if $txn;
$txn = undef;
+ $self->{skeleton}->remote_commit;
} elsif ($line eq "close\n") {
$self->_xdb_release;
$xdb = $txn = undef;
+ } elsif ($line eq "barrier\n") {
+ $xdb->commit_transaction if $txn;
+ $txn = undef;
+ print { $self->{skeleton}->{w} } "barrier $part\n" or
+ die "write failed to skeleton: $!\n";
} else {
- my ($len, $artnum, $object_id) = split(/ /, $line);
+ chomp $line;
+ my ($len, $artnum, $oid, $mid0) = split(/ /, $line);
$xdb ||= $self->_xdb_acquire;
if (!$txn) {
$xdb->begin_transaction;
my $n = read($r, my $msg, $len) or die "read: $!\n";
$n == $len or die "short read: $n != $len\n";
my $mime = PublicInbox::MIME->new(\$msg);
- $self->index_blob($mime, $len, $artnum, $object_id);
+ $artnum = int($artnum);
+ $self->add_message($mime, $n, $artnum, $oid, $mid0);
}
}
warn "$$ still in transaction\n" if $txn;
# called by V2Writable
sub index_raw {
- my ($self, $len, $msgref, $artnum, $object_id) = @_;
+ my ($self, $len, $msgref, $artnum, $object_id, $mid0) = @_;
my $w = $self->{w};
- print $w "$len $artnum $object_id\n", $$msgref or die
+ print $w "$len $artnum $object_id $mid0\n", $$msgref or die
"failed to write partition $!\n";
$w->flush or die "failed to flush: $!\n";
}
close $_[0]->{w} or die "failed to close write pipe: $!\n";
}
+# called by V2Writable:
+sub barrier {
+ my $w = $_[0]->{w};
+ print $w "barrier\n" or die "failed to print: $!";
+ $w->flush or die "failed to flush: $!";
+}
+
1;