-# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2021 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# Internal interface for a single Xapian shard in V2 inboxes.
use bytes qw(length);
use IO::Handle (); # autoflush
use PublicInbox::Eml;
+use PublicInbox::Sigfd;
sub new {
- my ($class, $v2w, $shard) = @_;
+ my ($class, $v2w, $shard) = @_; # v2w may be ExtSearchIdx
my $ibx = $v2w->{ibx};
- my $self = $class->SUPER::new($ibx, 1, $shard);
+ my $self = $ibx ? $class->SUPER::new($ibx, 1, $shard)
+ : $class->eidx_shard_new($v2w, $shard);
# create the DB before forking:
$self->idx_acquire;
$self->set_metadata_once;
my ($r, $w);
pipe($r, $w) or die "pipe failed: $!\n";
$w->autoflush(1);
+ my $oldset = PublicInbox::Sigfd::block_signals();
my $pid = fork;
defined $pid or die "fork failed: $!\n";
if ($pid == 0) {
+ eval { PublicInbox::DS->Reset };
+ # these signals are localized in parent
+ $SIG{$_} = 'IGNORE' for (qw(TERM INT QUIT));
+ PublicInbox::Sigfd::sig_setmask($oldset);
my $bnote = $v2w->atfork_child;
close $w or die "failed to close: $!";
die "unexpected MM $self->{mm}" if $self->{mm};
exit;
}
+ PublicInbox::Sigfd::sig_setmask($oldset);
$self->{pid} = $pid;
$self->{w} = $w;
close $r or die "failed to close: $!";
sub eml ($$) {
my ($r, $len) = @_;
+ return if $len == 0;
my $n = read($r, my $bref, $len) or die "read: $!\n";
$n == $len or die "short read: $n != $len\n";
PublicInbox::Eml->new(\$bref);
# this reads all the writes to $self->{w} from the parent process
sub shard_worker_loop ($$$$$) {
my ($self, $v2w, $r, $shard, $bnote) = @_;
- $0 = "pi-v2-shard[$shard]";
+ $0 = "shard[$shard]";
$self->begin_txn_lazy;
while (my $line = readline($r)) {
+ chomp $line;
$v2w->{current_info} = "[$shard] $line";
- if ($line eq "commit\n") {
+ if ($line eq 'commit') {
$self->commit_txn_lazy;
- } elsif ($line eq "close\n") {
+ } elsif ($line eq 'close') {
$self->idx_release;
- } elsif ($line eq "barrier\n") {
+ } elsif ($line eq 'barrier') {
$self->commit_txn_lazy;
# no need to lock < 512 bytes is atomic under POSIX
print $bnote "barrier $shard\n" or
die "write failed for barrier $!\n";
- } elsif ($line =~ /\AD ([a-f0-9]{40,}) ([0-9]+)\n\z/s) {
- $self->remove_by_oid($1, $2 + 0);
+ } elsif ($line =~ /\AD ([0-9]+)\z/s) {
+ $self->remove_by_docid($1 + 0);
} elsif ($line =~ s/\A\+X //) {
- my ($len, $docid, $xnum, $oid, $ng_or_dir) =
- split(/ /, $line, 5);
- $self->add_xref3($docid, $xnum, $oid, $ng_or_dir,
- eml($r, $len));
+ my ($len, $docid, $eidx_key) = split(/ /, $line, 3);
+ $self->add_eidx_info($docid, $eidx_key, eml($r, $len));
} elsif ($line =~ s/\A-X //) {
- my ($len, $docid, $xnum, $oid, $ng_or_dir) =
- split(/ /, $line, 5);
- $self->remove_xref3($docid, $xnum, $oid,
- $ng_or_dir, eml($r, $len));
+ my ($len, $docid, $eidx_key) = split(/ /, $line, 3);
+ $self->remove_eidx_info($docid, $eidx_key,
+ eml($r, $len));
+ } elsif ($line =~ s/\A=K (\d+) //) {
+ $self->set_keywords($1 + 0, split(/ /, $line));
+ } elsif ($line =~ s/\A-K (\d+) //) {
+ $self->remove_keywords($1 + 0, split(/ /, $line));
+ } elsif ($line =~ s/\A\+K (\d+) //) {
+ $self->add_keywords($1 + 0, split(/ /, $line));
+ } elsif ($line =~ s/\AO ([^\n]+)//) {
+ my $over_fn = $1;
+ $over_fn =~ tr/\0/\n/;
+ $self->over_check(PublicInbox::Over->new($over_fn));
} else {
- chomp $line;
+ my $eidx_key;
+ if ($line =~ s/\AX=(.+)\0//) {
+ $eidx_key = $1;
+ $v2w->{current_info} =~ s/\0/\\0 /;
+ }
# n.b. $mid may contain spaces(!)
my ($len, $bytes, $num, $oid, $ds, $ts, $tid, $mid)
= split(/ /, $line, 8);
ds => $ds,
ts => $ts,
}, 'PublicInbox::Smsg';
+ $smsg->{eidx_key} = $eidx_key if defined($eidx_key);
$self->add_message(eml($r, $len), $smsg);
}
}
}
sub index_raw {
- my ($self, $msgref, $eml, $smsg) = @_;
+ my ($self, $msgref, $eml, $smsg, $eidx_key) = @_;
if (my $w = $self->{w}) {
+ my @ekey = defined($eidx_key) ? ("X=$eidx_key\0") : ();
+ $msgref //= \($eml->as_string);
+ $smsg->{raw_bytes} //= length($$msgref);
# mid must be last, it can contain spaces (but not LF)
- print $w join(' ', @$smsg{qw(raw_bytes bytes
+ print $w @ekey, join(' ', @$smsg{qw(raw_bytes bytes
num blob ds ts tid mid)}),
"\n", $$msgref or die "failed to write shard $!\n";
} else {
if ($eml) {
- undef $$msgref;
+ undef($$msgref) if $msgref;
} else { # --xapian-only + --sequential-shard:
$eml = PublicInbox::Eml->new($msgref);
}
$self->begin_txn_lazy;
+ $smsg->{eidx_key} = $eidx_key if defined $eidx_key;
$self->add_message($eml, $smsg);
}
}
-sub shard_add_xref3 {
- my ($self, $docid, $xnum, $oid, $xibx, $eml) = @_;
- my $ng_or_dir = $xibx->{newsgroup} // $xibx->{inboxdir};
+sub shard_add_eidx_info {
+ my ($self, $docid, $eidx_key, $eml) = @_;
if (my $w = $self->{w}) {
my $hdr = $eml->header_obj->as_string;
my $len = length($hdr);
- print $w "+X $len $docid $xnum $oid $ng_or_dir\n", $hdr or
+ print $w "+X $len $docid $eidx_key\n", $hdr or
die "failed to write shard: $!";
} else {
- $self->add_xref3($docid, $xnum, $oid, $ng_or_dir, $eml);
+ $self->add_eidx_info($docid, $eidx_key, $eml);
}
}
-sub shard_remove_xref3 {
- my ($self, $docid, $oid, $xibx, $eml) = @_;
- my $ng_or_dir = $xibx->{newsgroup} // $xibx->{inboxdir};
+sub shard_remove_eidx_info {
+ my ($self, $docid, $eidx_key, $eml) = @_;
if (my $w = $self->{w}) {
- my $hdr = $eml->header_obj->as_string;
+ my $hdr = $eml ? $eml->header_obj->as_string : '';
my $len = length($hdr);
- print $w "-X $len $docid $oid $ng_or_dir\n", $hdr or
+ print $w "-X $len $docid $eidx_key\n", $hdr or
die "failed to write shard: $!";
} else {
- $self->remove_xref3($docid, $oid, $ng_or_dir, $eml);
+ $self->remove_eidx_info($docid, $eidx_key, $eml);
}
}
}
sub shard_remove {
- my ($self, $oid, $num) = @_;
- if (my $w = $self->{w}) { # triggers remove_by_oid in a shard child
- print $w "D $oid $num\n" or die "failed to write remove $!";
+ my ($self, $num) = @_;
+ if (my $w = $self->{w}) { # triggers remove_by_docid in a shard child
+ print $w "D $num\n" or die "failed to write remove $!";
+ } else { # same process
+ $self->remove_by_docid($num);
+ }
+}
+
+sub shard_set_keywords {
+ my ($self, $docid, @kw) = @_;
+ if (my $w = $self->{w}) { # triggers remove_by_docid in a shard child
+ print $w "=K $docid @kw\n" or die "failed to write: $!";
+ } else { # same process
+ $self->set_keywords($docid, @kw);
+ }
+}
+
+sub shard_remove_keywords {
+ my ($self, $docid, @kw) = @_;
+ if (my $w = $self->{w}) { # triggers remove_by_docid in a shard child
+ print $w "-K $docid @kw\n" or die "failed to write: $!";
} else { # same process
- $self->remove_by_oid($oid, $num);
+ $self->remove_keywords($docid, @kw);
+ }
+}
+
+sub shard_add_keywords {
+ my ($self, $docid, @kw) = @_;
+ if (my $w = $self->{w}) { # triggers remove_by_docid in a shard child
+ print $w "+K $docid @kw\n" or die "failed to write: $!";
+ } else { # same process
+ $self->add_keywords($docid, @kw);
+ }
+}
+
+sub shard_over_check {
+ my ($self, $over) = @_;
+ if (my $w = $self->{w}) { # triggers remove_by_docid in a shard child
+ my ($over_fn) = $over->{dbh}->sqlite_db_filename;
+ $over_fn =~ tr/\n/\0/;
+ print $w "O $over_fn\n" or die "failed to write over $!";
+ } else {
+ $self->over_check($over);
}
}