use PublicInbox::Spawn qw(spawn nodatacow_dir);
use PublicInbox::Git qw(git_unquote);
use PublicInbox::MsgTime qw(msg_timestamp msg_datestamp);
-our @EXPORT_OK = qw(crlf_adjust log2stack is_ancestor check_size);
+our @EXPORT_OK = qw(crlf_adjust log2stack is_ancestor check_size prepare_stack);
my $X = \%PublicInbox::Search::X;
my ($DB_CREATE_OR_OPEN, $DB_OPEN);
our $DB_NO_SYNC = 0;
}
}
return unless defined $flag;
- $flag |= $DB_NO_SYNC if $self->{ibx}->{-no_fsync};
+ $flag |= $DB_NO_SYNC if ($self->{ibx} // $self->{eidx})->{-no_fsync};
my $xdb = eval { ($X->{WritableDatabase})->new($dir, $flag) };
croak "Failed opening $dir: $@" if $@;
$self->{xdb} = $xdb;
if (defined(my $eidx_key = $smsg->{eidx_key})) {
$doc->add_boolean_term('O'.$eidx_key);
- $doc->add_boolean_term('P'.
- "$eidx_key:$smsg->{num}:$smsg->{blob}");
}
msg_iter($eml, \&index_xapian, [ $self, $doc ]);
index_ids($self, $doc, $eml, $mids);
}
}
-sub add_xref3 {
- my ($self, $docid, $xnum, $oid, $eidx_key, $eml) = @_;
+sub add_eidx_info {
+ my ($self, $docid, $oid, $eidx_key, $eml) = @_;
begin_txn_lazy($self);
my $doc = _get_doc($self, $docid, $oid) or return;
term_generator($self)->set_document($doc);
$doc->add_boolean_term('O'.$eidx_key);
- $doc->add_boolean_term('P'."$eidx_key:$xnum:$oid");
index_list_id($self, $doc, $eml);
$self->{xdb}->replace_document($docid, $doc);
}
-sub remove_xref3 {
+sub remove_eidx_info {
my ($self, $docid, $oid, $eidx_key, $eml) = @_;
begin_txn_lazy($self);
my $doc = _get_doc($self, $docid, $oid) or return;
- my $xref3 = PublicInbox::Smsg::xref3(undef, $doc);
- my %x3 = map { $_ => undef } @$xref3;
- for (grep(/\A\Q$eidx_key\E:[0-9]+:\Q$oid\E\z/, @$xref3)) {
- delete $x3{$_};
- $doc->remove_term('P' . $_);
- }
- if (scalar(keys(%x3)) == 0) {
- $self->{xdb}->delete_document($docid);
- if (my $del_fh = $self->{del_fh}) { # TODO
- print $del_fh $docid, "\n" or die "E: print $!";
- }
- } else {
- if (!grep(/\A\Q$eidx_key\E:/, keys %x3)) {
- $doc->remove_term('O'.$eidx_key);
- }
- for my $l ($eml->header_raw('List-Id')) {
- $l =~ /<([^>]+)>/ or next;
- my $lid = lc $1;
- $doc->remove_term('G' . $lid);
-
- # nb: we don't remove the XL probabilistic terms
- # since terms may overlap if cross-posted.
- #
- # IOW, a message which has both <foo.example.com>
- # and <bar.example.com> would have overlapping
- # "XLexample" and "XLcom" as terms and which we
- # wouldn't know if they're safe to remove if we just
- # unindex <foo.example.com> while preserving
- # <bar.example.com>.
- #
- # In any case, this entire sub is will likely never
- # be needed and users using the "l:" prefix are probably
- # rarer.
- }
- $self->{xdb}->replace_document($docid, $doc);
+ $doc->remove_term('O'.$eidx_key);
+ for my $l ($eml->header_raw('List-Id')) {
+ $l =~ /<([^>]+)>/ or next;
+ my $lid = lc $1;
+ $doc->remove_term('G' . $lid);
+
+ # nb: we don't remove the XL probabilistic terms
+ # since terms may overlap if cross-posted.
+ #
+ # IOW, a message which has both <foo.example.com>
+ # and <bar.example.com> would have overlapping
+ # "XLexample" and "XLcom" as terms and which we
+ # wouldn't know if they're safe to remove if we just
+ # unindex <foo.example.com> while preserving
+ # <bar.example.com>.
+ #
+ # In any case, this entire sub is will likely never
+ # be needed and users using the "l:" prefix are probably
+ # rarer.
}
+ $self->{xdb}->replace_document($docid, $doc);
}
sub get_val ($$) {
unindex_eml($self, $oid, PublicInbox::Eml->new($bref));
}
+sub with_umask {
+ my $self = shift;
+ ($self->{ibx} // $self->{eidx})->with_umask(@_);
+}
+
# called by public-inbox-index
sub index_sync {
my ($self, $opt) = @_;
delete $self->{lock_path} if $opt->{-skip_lock};
- $self->{ibx}->with_umask(\&_index_sync, $self, $opt);
+ $self->with_umask(\&_index_sync, $self, $opt);
if ($opt->{reindex}) {
my %again = %$opt;
delete @again{qw(rethread reindex)};
$self->{oidx}->rethread_done($sync->{-opt}) if $newest; # all done
commit_txn_lazy($self);
- $self->{ibx}->git->cleanup;
+ $sync->{ibx}->git->cleanup;
my $nr = ${$sync->{nr}};
idx_release($self, $nr);
# let another process do some work...
# only for v1
sub process_stack {
my ($self, $sync, $stk) = @_;
- my $git = $self->{ibx}->git;
+ my $git = $sync->{ibx}->git;
my $max = $self->{batch_bytes};
my $nr = 0;
$sync->{nr} = \$nr;
sub begin_txn_lazy {
my ($self) = @_;
- $self->{ibx}->with_umask(\&_begin_txn, $self) if !$self->{txn};
+ $self->with_umask(\&_begin_txn, $self) if !$self->{txn};
}
# store 'indexlevel=medium' in v2 shard=0 and v1 (only one shard)
sub commit_txn_lazy {
my ($self) = @_;
delete($self->{txn}) and
- $self->{ibx}->with_umask(\&_commit_txn, $self);
+ $self->with_umask(\&_commit_txn, $self);
}
sub worker_done {
sub eidx_shard_new {
my ($class, $eidx, $shard) = @_;
my $self = bless {
+ eidx => $eidx,
xpfx => $eidx->{xpfx},
indexlevel => $eidx->{indexlevel},
-skip_docdata => 1,