-# 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>
# for XOVER, OVER in NNTP, and feeds/homepage/threads in PSGI
}
}
+sub ibx_id {
+ my ($self, $eidx_key) = @_;
+ id_for($self, 'inboxes', 'ibx_id', eidx_key => $eidx_key);
+}
+
sub sid {
my ($self, $path) = @_;
return unless defined $path && $path ne '';
$tid;
}
-sub parse_references ($$$) {
- my ($smsg, $hdr, $mids) = @_;
- my $refs = references($hdr);
- push(@$refs, @$mids) if scalar(@$mids) > 1;
- return $refs if scalar(@$refs) == 0;
-
- # prevent circular references here:
- my %seen = ( $smsg->{mid} => 1 );
- my @keep;
- foreach my $ref (@$refs) {
- if (length($ref) > PublicInbox::MID::MAX_MID_SIZE) {
- warn "References: <$ref> too long, ignoring\n";
- next;
- }
- push(@keep, $ref) unless $seen{$ref}++;
- }
- $smsg->{references} = '<'.join('> <', @keep).'>' if @keep;
- \@keep;
-}
-
# normalize subjects so they are suitable as pathnames for URLs
# XXX: consider for removal
sub subject_path ($) {
my ($self, $eml, $smsg) = @_;
$smsg->{lines} = $eml->body_raw =~ tr!\n!\n!;
my $mids = mids_for_index($eml);
- my $refs = parse_references($smsg, $eml, $mids);
+ my $refs = $smsg->parse_references($eml, $mids);
+ $mids->[0] //= do {
+ $smsg->{mid} //= '';
+ $eml->{-lei_fake_mid};
+ };
my $subj = $smsg->{subject};
my $xpath;
if ($subj ne '') {
$dbh->do(<<'');
CREATE TABLE IF NOT EXISTS over (
- num INTEGER NOT NULL, /* NNTP article number == IMAP UID */
+ num INTEGER PRIMARY KEY NOT NULL, /* NNTP article number == IMAP UID */
tid INTEGER NOT NULL, /* THREADID (IMAP REFERENCES threading, JMAP) */
sid INTEGER, /* Subject ID (IMAP ORDEREDSUBJECT "threading") */
ts INTEGER, /* IMAP INTERNALDATE (Received: header, git commit time) */
ds INTEGER, /* RFC-2822 sent Date: header, git author time */
- ddd VARBINARY, /* doc-data-deflated (->to_doc_data, ->load_from_data) */
- UNIQUE (num)
+ ddd VARBINARY /* doc-data-deflated (->to_doc_data, ->load_from_data) */
)
$dbh->do('CREATE INDEX IF NOT EXISTS idx_tid ON over (tid)');
sub create {
my ($self) = @_;
- unless (-r $self->{filename}) {
+ my $fn = $self->{filename} // do {
+ croak('BUG: no {filename}') unless $self->{dbh};
+ return;
+ };
+ unless (-r $fn) {
require File::Path;
require File::Basename;
- File::Path::mkpath(File::Basename::dirname($self->{filename}));
+ File::Path::mkpath(File::Basename::dirname($fn));
}
# create the DB:
PublicInbox::Over::dbh($self);
my ($self) = @_;
$self->{-eidx_prep} //= do {
my $dbh = $self->dbh;
- $dbh->do(<<"");
+ $dbh->do(<<'');
INSERT OR IGNORE INTO counter (key) VALUES ('eidx_docid')
$dbh->do(<<'');
val VARCHAR(255) NOT NULL
)
- $dbh;
+ # A queue of current docids which need reindexing.
+ # eidxq persists across aborted -extindex invocations
+ # Currently used for "-extindex --reindex" for Xapian
+ # data, but may be used in more places down the line.
+ $dbh->do(<<'');
+CREATE TABLE IF NOT EXISTS eidxq (docid INTEGER PRIMARY KEY NOT NULL)
+
+ 1;
};
}
sub add_xref3 {
my ($self, $docid, $xnum, $oidhex, $eidx_key) = @_;
begin_lazy($self);
- my $ibx_id = id_for($self, 'inboxes', 'ibx_id', eidx_key => $eidx_key);
+ my $ibx_id = ibx_id($self, $eidx_key);
my $oidbin = pack('H*', $oidhex);
my $sth = $self->{dbh}->prepare_cached(<<'');
INSERT OR IGNORE INTO xref3 (docid, ibx_id, xnum, oidbin) VALUES (?, ?, ?, ?)
my $oidbin = pack('H*', $oidhex);
my ($sth, $ibx_id);
if (defined $eidx_key) {
- $ibx_id = id_for($self, 'inboxes', 'ibx_id',
- eidx_key => $eidx_key);
+ $ibx_id = ibx_id($self, $eidx_key);
$sth = $self->{dbh}->prepare_cached(<<'');
DELETE FROM xref3 WHERE docid = ? AND ibx_id = ? AND oidbin = ?
$sth->execute;
}
+sub eidxq_add {
+ my ($self, $docid) = @_;
+ $self->dbh->prepare_cached(<<'')->execute($docid);
+INSERT OR IGNORE INTO eidxq (docid) VALUES (?)
+
+}
+
+sub eidxq_del {
+ my ($self, $docid) = @_;
+ $self->dbh->prepare_cached(<<'')->execute($docid);
+DELETE FROM eidxq WHERE docid = ?
+
+}
+
1;