No ext_urls

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

diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm
index 58fdea0e197ce4c54364a0e45befc89560284f6a..d6409b2a5fdb2017a69344aed92e60be77b2eb44 100644 (file)
--- a/lib/PublicInbox/Over.pm
+++ b/lib/PublicInbox/Over.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-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>
 
 # for XOVER, OVER in NNTP, and feeds/homepage/threads in PSGI
@@ -16,11 +16,12 @@ use constant DEFAULT_LIMIT => 1000;
 sub dbh_new {
        my ($self, $rw) = @_;
        my $f = delete $self->{filename};
-       if (!-f $f) { # SQLite defaults mode to 0644, we want 0666
+       if (!-s $f) { # SQLite defaults mode to 0644, we want 0666
                if ($rw) {
-                       require PublicInbox::Spawn;
+                       require PublicInbox::Syscall;
+                       my ($dir) = ($f =~ m!(.+)/[^/]+\z!);
+                       PublicInbox::Syscall::nodatacow_dir($dir);
                        open my $fh, '+>>', $f or die "failed to open $f: $!";
-                       PublicInbox::Spawn::nodatacow_fd(fileno($fh));
                } else {
                        $self->{filename} = $f; # die on stat() below:
                }
@@ -106,8 +107,8 @@ sub do_get {
 }
 
 sub query_xover {
-       my ($self, $beg, $end) = @_;
-       do_get($self, <<'', {}, $beg, $end);
+       my ($self, $beg, $end, $opt) = @_;
+       do_get($self, <<'', $opt, $beg, $end);
 SELECT num,ts,ds,ddd FROM over WHERE num >= ? AND num <= ?
 ORDER BY num ASC
 
@@ -272,13 +273,13 @@ SELECT ibx_id,xnum,oidbin FROM xref3 WHERE docid = ? ORDER BY ibx_id,xnum ASC
        my $eidx_key_sth = $dbh->prepare_cached(<<'', undef, 1);
 SELECT eidx_key FROM inboxes WHERE ibx_id = ?
 
-       [ map {
-               my $r = $_;
+       for my $r (@$rows) {
                $eidx_key_sth->execute($r->[0]);
                my $eidx_key = $eidx_key_sth->fetchrow_array;
                $eidx_key //= "missing://ibx_id=$r->[0]";
-               "$eidx_key:$r->[1]:".unpack('H*', $r->[2]);
-       } @$rows ];
+               $r = "$eidx_key:$r->[1]:".unpack('H*', $r->[2]);
+       }
+       $rows;
 }
 
 sub next_by_mid {
@@ -371,4 +372,15 @@ SELECT COUNT(*) FROM xref3 WHERE oidbin = ?
 
 sub blob_exists { oidbin_exists($_[0], pack('H*', $_[1])) }
 
+# used by NNTP.pm
+sub ids_after {
+       my ($self, $num) = @_;
+       my $ids = dbh($self)->selectcol_arrayref(<<'', undef, $$num);
+SELECT num FROM over WHERE num > ?
+ORDER BY num ASC LIMIT 1000
+
+       $$num = $ids->[-1] if @$ids;
+       $ids;
+}
+
 1;