X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiImportKw.pm;h=4dd938f5c12c85ad41d1ed322aad9a33d59c49b8;hb=refs%2Fheads%2Fmaster;hp=2878cbdf30f7751d0262a217f4f5a7fe6f796712;hpb=bdecd7ed8e0dcf0b45491b947cd737ba8cfe38a3;p=public-inbox.git
diff --git a/lib/PublicInbox/LeiImportKw.pm b/lib/PublicInbox/LeiImportKw.pm
index 2878cbdf..4dd938f5 100644
--- a/lib/PublicInbox/LeiImportKw.pm
+++ b/lib/PublicInbox/LeiImportKw.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
# WQ worker for dealing with LeiImport IMAP flags on already-imported messages
@@ -11,8 +11,11 @@ use parent qw(PublicInbox::IPC);
sub new {
my ($cls, $lei) = @_;
my $self = bless { -wq_ident => 'lei import_kw worker' }, $cls;
- my ($op_c, $ops) = $lei->workers_start($self, $self->detect_nproc);
+ my $j = $self->detect_nproc // 4;
+ $j = 4 if $j > 4;
+ my ($op_c, $ops) = $lei->workers_start($self, $j);
$op_c->{ops} = $ops; # for PktOp->event_step
+ $self->{lei_sock} = $lei->{sock};
$lei->{ikw} = $self;
}
@@ -25,31 +28,26 @@ sub ipc_atfork_child {
$self->{verbose} = $lei->{opt}->{verbose};
$self->{lse} = $self->{sto}->search;
$self->{over} = $self->{lse}->over;
- $self->{-lms_ro} = $net->{-lms_ro} || die 'BUG: net->{-lms_ro} FALSE';
+ $self->{-lms_rw} = $net->{-lms_rw} || die 'BUG: net->{-lms_rw} FALSE';
$self->SUPER::ipc_atfork_child;
}
sub ck_update_kw { # via wq_io_do
my ($self, $url, $uid, $kw) = @_;
- my $oidbin = $self->{-lms_ro}->imap_oidbin($url, $uid) // return;
- my @docids = $self->{over}->oidbin_exists($oidbin) or return;
+ my @oidbin = $self->{-lms_rw}->num_oidbin($url, $uid);
+ my $uid_url = "$url/;UID=$uid";
+ @oidbin > 1 and warn("W: $uid_url not unique:\n",
+ map { "\t".unpack('H*', $_)."\n" } @oidbin);
+ my %seen;
+ my @docids = sort { $a <=> $b } grep { !$seen{$_}++ }
+ map { $self->{over}->oidbin_exists($_) } @oidbin;
$self->{lse}->kw_changed(undef, $kw, \@docids) or return;
- $self->{verbose} and
- $self->{lei}->qerr('# '.unpack('H*', $oidbin)." => @$kw\n");
- $self->{sto}->ipc_do('set_eml_vmd', undef, { kw => $kw }, \@docids);
-}
-
-sub ikw_done_wait {
- my ($arg, $pid) = @_;
- my ($self, $lei) = @$arg;
- my $wait = $lei->{sto}->ipc_do('done');
- $lei->can('wq_done_wait')->($arg, $pid);
+ $self->{verbose} and $self->{lei}->qerr("# $uid_url => @$kw\n");
+ $self->{sto}->wq_do('set_eml_vmd', undef, { kw => $kw }, \@docids);
}
sub _lei_wq_eof { # EOF callback for main lei daemon
- my ($lei) = @_;
- my $ikw = delete $lei->{ikw} or return $lei->fail;
- $ikw->wq_wait_old(\&ikw_done_wait, $lei);
+ $_[0]->wq_eof('ikw');
}
1;