treewide: replace /^I: / prefix with /^# /

[public-inbox.git] / lib / PublicInbox / MiscIdx.pm

diff --git a/lib/PublicInbox/MiscIdx.pm b/lib/PublicInbox/MiscIdx.pm
index ab5e029a4625c6b77f16c9166de1d0e9afacbf3b..19200b92c910c8e22de43acccdbf1bd9e89fa0e6 100644 (file)
--- a/lib/PublicInbox/MiscIdx.pm
+++ b/lib/PublicInbox/MiscIdx.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # like PublicInbox::SearchIdx, but for searching for non-mail messages.
@@ -16,11 +16,11 @@ use v5.10.1;
 use PublicInbox::InboxWritable;
 use PublicInbox::Search; # for SWIG Xapian and Search::Xapian compat
 use PublicInbox::SearchIdx qw(index_text term_generator add_val);
-use PublicInbox::Spawn qw(nodatacow_dir);
 use Carp qw(croak);
 use File::Path ();
 use PublicInbox::MiscSearch;
 use PublicInbox::Config;
+use PublicInbox::Syscall;
 my $json;
 
 sub new {
@@ -28,9 +28,10 @@ sub new {
        PublicInbox::SearchIdx::load_xapian_writable();
        my $mi_dir = "$eidx->{xpfx}/misc";
        File::Path::mkpath($mi_dir);
-       nodatacow_dir($mi_dir);
+       PublicInbox::Syscall::nodatacow_dir($mi_dir);
        my $flags = $PublicInbox::SearchIdx::DB_CREATE_OR_OPEN;
        $flags |= $PublicInbox::SearchIdx::DB_NO_SYNC if $eidx->{-no_fsync};
+       $flags |= $PublicInbox::SearchIdx::DB_DANGEROUS if $eidx->{-dangerous};
        $json //= PublicInbox::Config::json();
        bless {
                mi_dir => $mi_dir,
@@ -39,25 +40,30 @@ sub new {
        }, $class;
 }
 
-sub begin_txn {
+sub _begin_txn ($) {
        my ($self) = @_;
-       croak 'BUG: already in txn' if $self->{xdb}; # XXX make lazy?
        my $wdb = $PublicInbox::Search::X{WritableDatabase};
        my $xdb = eval { $wdb->new($self->{mi_dir}, $self->{flags}) };
        croak "Failed opening $self->{mi_dir}: $@" if $@;
-       $self->{xdb} = $xdb;
        $xdb->begin_transaction;
+       $xdb;
 }
 
 sub commit_txn {
        my ($self) = @_;
-       croak 'BUG: not in txn' unless $self->{xdb}; # XXX make lazy?
-       delete($self->{xdb})->commit_transaction;
+       my $xdb = delete $self->{xdb} or return;
+       $xdb->commit_transaction;
+}
+
+sub create_xdb {
+       my ($self) = @_;
+       $self->{xdb} //= _begin_txn($self);
+       commit_txn($self);
 }
 
 sub remove_eidx_key {
        my ($self, $eidx_key) = @_;
-       my $xdb = $self->{xdb};
+       my $xdb = $self->{xdb} //= _begin_txn($self);
        my $head = $xdb->postlist_begin('Q'.$eidx_key);
        my $tail = $xdb->postlist_end('Q'.$eidx_key);
        my @docids; # only one, unless we had bugs
@@ -66,7 +72,7 @@ sub remove_eidx_key {
        }
        for my $docid (@docids) {
                $xdb->delete_document($docid);
-               warn "I: remove inbox docid #$docid ($eidx_key)\n";
+               warn "# remove inbox docid #$docid ($eidx_key)\n";
        }
 }
 
@@ -74,7 +80,7 @@ sub remove_eidx_key {
 sub index_ibx {
        my ($self, $ibx) = @_;
        my $eidx_key = $ibx->eidx_key;
-       my $xdb = $self->{xdb};
+       my $xdb = $self->{xdb} //= _begin_txn($self);
        # Q = uniQue in Xapian terminology
        my $head = $xdb->postlist_begin('Q'.$eidx_key);
        my $tail = $xdb->postlist_end('Q'.$eidx_key);
@@ -102,12 +108,16 @@ EOF
        $doc->add_boolean_term('Q'.$eidx_key); # uniQue id
        $doc->add_boolean_term('T'.'inbox'); # Type
 
+       # force reread from disk, {description} could be loaded from {misc}
+       delete @$ibx{qw(-art_min -art_max description)};
        if (defined($ibx->{newsgroup}) && $ibx->nntp_usable) {
                $doc->add_boolean_term('T'.'newsgroup'); # additional Type
+               my $n = $ibx->art_min;
+               add_val($doc, $PublicInbox::MiscSearch::ART_MIN, $n) if $n;
+               $n = $ibx->art_max;
+               add_val($doc, $PublicInbox::MiscSearch::ART_MAX, $n) if $n;
        }
 
-       # force reread from disk, {description} could be loaded from {misc}
-       delete $ibx->{description};
        my $desc = $ibx->description;
 
        # description = S/Subject (or title)